Merge branch '43977-27' of git://github.com/samhemelryk/moodle

Conflicts: theme/bootstrapbase/style/moodle.css
2014-02-10 18:15:57 +08:00
parent 72d953e19e 2ea3e43342
commit 396548fad4
2 changed files with 9 additions and 2 deletions
@@ -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;
-}
+}