Merge branch 'MDL-62058-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:11:28 +0000 (10:11 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 3 May 2018 08:11:28 +0000 (10:11 +0200)
theme/boost/scss/moodle/modules.scss
theme/boost/scss/moodle/undo.scss

index 1e9e4d0..253ffc3 100644 (file)
@@ -210,11 +210,6 @@ select {
     margin-left: 4px;
 }
 
-.navbar-fixed-top,
-.navbar-fixed-bottom {
-    z-index: 4030;
-}
-
 .ie .row-fluid .desktop-first-column {
     margin-left: 0;
 }
index cd44c0e..59952ee 100644 (file)
@@ -134,7 +134,7 @@ ol {
 }
 
 // Set menus in the fixed header to scroll vertically when they are longer than the page.
-.navbar-static-top .dropdown .dropdown-menu {
+.navbar.fixed-top .dropdown .dropdown-menu {
     max-height: calc(100vh - #{$navbar-height});
     overflow-y: auto;
 }