Merge branch '43977-26' of git://github.com/samhemelryk/moodle into M…

…OODLE_26_STABLE Conflicts: theme/bootstrapbase/style/moodle.css
moodle · Feb 10, 2014 · 98c5ac4 · 98c5ac4
2 parents 5eb9a4f + a769537
commit 98c5ac4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/theme/bootstrapbase/less/moodle/undo.less b/theme/bootstrapbase/less/moodle/undo.less
@@ -175,10 +175,17 @@ img.icon-pre {
     display: inline;
 }
 
+// Allow the custom menu to expand/collapse when the user hovers over it with JS disabled.
+body:not(.jsenabled) .dropdown:hover > .dropdown-menu {
+    display: block;
+    margin-top: -6px; // We need to move it up to counter the arrows as they introduce hover bugs.
+}
+
 // Extends bootstrapbase/less/bootstrap/navbar.less
 // to enable scroll in the language menu.
+body:not(.jsenabled) .langmenu:hover > .dropdown-menu,
 .langmenu.open > .dropdown-menu {
     display: block;
     max-height: 150px;
     overflow-y: auto;
-}
+}
diff --git a/theme/bootstrapbase/style/moodle.css b/theme/bootstrapbase/style/moodle.css