Merge branch 'MDL-50533-master' of git://github.com/jethac/moodle

This commit is contained in:
Dan Poltawski 2015-06-23 14:12:21 +01:00
commit 6d59f63914
2 changed files with 7 additions and 6 deletions

View File

@ -438,7 +438,7 @@
color: @grayDark;
}
}
.nav-collapse.active {
.nav-collapse.in {
height: auto;
.usermenu .moodle-actionmenu[data-enhanced] {
.toggle-display {
@ -472,7 +472,7 @@
}
.navbar {
.nav-collapse.active {
.nav-collapse.in {
border-top: 1px solid @navbarBorder;
&.pull-left,
&.pull-right {
@ -494,7 +494,8 @@
}
}
.nav, .nav .dropdown-menu {
.nav,
.nav .dropdown-menu {
.dropdown-submenu {
.dropdown-toggle {
&:after {
@ -542,7 +543,7 @@
}
}
&.navbar-inverse {
.nav-collapse.active {
.nav-collapse.in {
border-top-color: @navbarInverseBorder;
.nav,
.nav .dropdown-menu {
@ -573,7 +574,7 @@
.dir-rtl {
.navbar {
.nav-collapse.active {
.nav-collapse.in {
> .nav {
margin: 0;
> li > a {

File diff suppressed because one or more lines are too long