Fix: #777 - Re: Scroll in the drop down menus #773 - Custom menu sub-…

…menus no longer accessible.
gjb2048 · Oct 16, 2016 · baa9b07 · baa9b07
1 parent 016ca09
commit baa9b07
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 19 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,5 +1,6 @@
 New in 3.0.1.12
 ===============
+- FIX: Issue #777: Re: Scroll in the drop down menus #773 - Custom menu sub-menus no longer accessible.
 - FIX: Tidy up Bootstrap override LESS.
 
 New in 3.0.1.11

diff --git a/classes/output/core_renderer.php b/classes/output/core_renderer.php
@@ -502,13 +502,19 @@ protected function render_custom_menu_item(custom_menu_item $menunode, $level =
                 $content .= $this->getfontawesomemarkup('caret-right');
             }
             $content .= '</a>';
-            $content .= '<div class="dropdown-menu">';
-            $content .= '<ul>';
+            if ($level == 1) {
+                $content .= '<div class="dropdown-menu">';
+                $content .= '<ul>';
+            } else {
+                $content .= '<ul class="dropdown-menu">';
+            }
             foreach ($menunode->get_children() as $menunode) {
                 $content .= $this->render_custom_menu_item($menunode, 0);
             }
             $content .= '</ul>';
-            $content .= '</div>';
+            if ($level == 1) {
+                $content .= '</div>';
+            }
         } else {
             // Also, if the node's text matches '####', add a class so we can treat it as a divider.
             $content = '';

diff --git a/less/essential-alternative.less b/less/essential-alternative.less
@@ -299,8 +299,10 @@
                                 .dropdown-toggle:after {
                                     border-left-color: inherit;
                                 }
-                                &:focus, &:hover .dropdown-toggle:after {
-                                    border-left-color: ~"[[setting:alternativethemenavcolor@{index}]]";
+                                &:focus, &:hover {
+                                    .dropdown-toggle:after {
+                                        border-left-color: ~"[[setting:alternativethemenavcolor@{index}]]";
+                                    }
                                 }
                             }
                         }
@@ -1127,8 +1129,10 @@
                                         border-left-color: transparent;
                                         border-top-color: ~"[[setting:alternativethemeiconcolor@{index}]]";
                                     }
-                                    &:hover .dropdown-toggle:after {
-                                        border-top-color: ~"[[setting:alternativethemenavcolor@{index}]]";
+                                    &:focus, &:hover {
+                                        .dropdown-toggle:after {
+                                            border-top-color: ~"[[setting:alternativethemenavcolor@{index}]]";
+                                        }
                                     }
                                 }
                                 .dropdown-submenu, .dropdown-submenu:hover {

diff --git a/less/essential/navigation.less b/less/essential/navigation.less
@@ -41,6 +41,10 @@ div.dropdown-menu > ul {
     li a {
         display: block;
     }
+    #custom_menu & {
+        max-height: none;
+        overflow-y: visible;
+    }
 }
 
 .navbar {
@@ -119,7 +123,7 @@ div.dropdown-menu > ul {
             }
         }
 
-        .dropdown-menu {
+        .dropdown > .dropdown-menu {
             margin: 0;
         }
 

diff --git a/less/essential/settings/navigation.less b/less/essential/settings/navigation.less
@@ -54,8 +54,10 @@
         .dropdown-toggle:after {
           border-left-color: inherit;
         }
-        &:hover .dropdown-toggle:after {
-          border-left-color: ~"[[setting:themenavcolor]]";
+        &:focus, &:hover {
+          .dropdown-toggle:after {
+            border-left-color: ~"[[setting:themenavcolor]]";
+          }
         }
       }
     }
@@ -162,8 +164,10 @@
             border-left-color: transparent;
             border-top-color: ~"[[setting:themeiconcolor]]";
           }
-          &:hover .dropdown-toggle:after {
-            border-top-color: ~"[[setting:themenavcolor]]";
+          &:focus, &:hover {
+            .dropdown-toggle:after {
+              border-top-color: ~"[[setting:themenavcolor]]";
+            }
           }
         }
         .dropdown-submenu, .dropdown-submenu:hover {

diff --git a/style/essential-alternative.css b/style/essential-alternative.css
diff --git a/style/essential-rtl.css b/style/essential-rtl.css
diff --git a/style/essential-rtl_ie9.css b/style/essential-rtl_ie9.css
diff --git a/style/essential-settings.css b/style/essential-settings.css
@@ -903,6 +903,7 @@ button.website:focus {
 .navbar .navbar-inner .nav .dropdown-menu .dropdown-submenu .dropdown-toggle:after {
   border-left-color: inherit;
 }
+.navbar .navbar-inner .nav .dropdown-menu .dropdown-submenu:focus .dropdown-toggle:after,
 .navbar .navbar-inner .nav .dropdown-menu .dropdown-submenu:hover .dropdown-toggle:after {
   border-left-color: [[setting:themenavcolor]];
 }
@@ -980,6 +981,8 @@ button.website:focus {
     border-left-color: transparent;
     border-top-color: [[setting:themeiconcolor]];
   }
+  .navbar .nav-collapse.in .nav .dropdown-submenu:focus .dropdown-toggle:after,
+  .navbar .nav-collapse.in .nav .dropdown-menu .dropdown-submenu:focus .dropdown-toggle:after,
   .navbar .nav-collapse.in .nav .dropdown-submenu:hover .dropdown-toggle:after,
   .navbar .nav-collapse.in .nav .dropdown-menu .dropdown-submenu:hover .dropdown-toggle:after {
     border-top-color: [[setting:themenavcolor]];

diff --git a/style/essential.css b/style/essential.css
diff --git a/style/essential_ie9.css b/style/essential_ie9.css