Merge branch 'MDL-50533-29' of git://github.com/jethac/moodle into MOODLE_29_STABLE

2015-06-23 14:13:13 +01:00
parent 4342a37310 c74f2c3e70
commit b29b31dc12
2 changed files with 7 additions and 6 deletions
@@ -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 {