mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-19 06:18:28 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-50497-M30' of git://github.com/lazydaisy/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
David Monllao 2015-07-01 08:54:28 +08:00
commit b4d7038a88
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
theme/bootstrapbase/less/moodle/modules.less
View File

@ -326,18 +326,25 @@ div#dock {
.divider {
overflow: hidden;
width: 0;
height: 40px;
border-left: 1px solid #e5e5e5;
border-right: 1px solid #fff;
height: @navbarHeight;
border-left: 1px solid @navbarBackground;
border-right: 1px solid @navbarBackgroundHighlight;
}
}
.navbar-inverse {
.nav {
.divider {
border-left-color: @navbarInverseBackground;
border-right-color: lighten(@navbarInverseBackground, 25%);
}
}
}
.dropdown-menu {
.divider {
width: auto;
height: 1px;
border-left: 0px none;
border-right: 0px none;
border-left: 0 none;
border-right: 0 none;
}
}

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long