Fix: Broken site-nav children menu #8

Codeinwp · Mar 18, 2014 · d938a63 · d938a63
1 parent a064a1d
commit d938a63
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/assets/css/template.css b/assets/css/template.css
diff --git a/assets/js/functions.js b/assets/js/functions.js
@@ -8,15 +8,17 @@
       $(this).toggleClass('open').next('#site-navigation').slideToggle(300);
     });
 
-    $('#site-navigation .sub-menu').before('<i class="fa fa-caret-right"></i>');
-    $('#site-navigation .children').before('<i class="fa fa-caret-right"></i>');
+    $('#site-navigation .sub-menu, #site-navigation .children').before('<i class="fa fa-caret-right"></i>');
 
     if(!!('ontouchstart' in window)){
-      $('#site-navigation .menu-item-has-children .fa').click(function() {
+      $('#site-navigation .menu-item-has-children .fa, #site-navigation .page_item_has_children .fa')
+      .click(function() {
         $(this).toggleClass('open').next('ul').slideToggle(300);
       });
     } else {
-      $('#site-navigation .menu-item-has-children').not('.current-menu-parent').not('.current-menu-ancestor').hover(function() {
+      $('#site-navigation .menu-item-has-children, #site-navigation .page_item_has_children')
+      .not('.current-menu-parent, .current_page_parent, .current_page_ancestor, .current-menu-ancestor')
+      .hover(function() {
         $(this).children('.fa').toggleClass('open').next('ul').stop(true, true).slideToggle(300);
       });
     }

diff --git a/assets/less/style.less b/assets/less/style.less
@@ -571,12 +571,17 @@ input#submit {
 
 	.current-menu-item,
 	.current-menu-parent,
-	.current-menu-ancestor {
+	.current-menu-ancestor,
+	.current_page_item,
+	.current_page_parent,
+	.current_page_ancestor {
 		> a { color: rgba(255,255,255,.5) }
 	}
 
 	.current-menu-parent,
-	.current-menu-ancestor {
+	.current-menu-ancestor,
+	.current_page_parent,
+	.current_page_ancestor {
 		> .fa {
 			.rotate(90deg);
 
@@ -585,7 +590,8 @@ input#submit {
 			}
 		}
 
-		> .sub-menu {
+		> .sub-menu,
+		> .children {
 			display: block;
 		}
 	}

diff --git a/readme.txt b/readme.txt
@@ -50,9 +50,11 @@ Icon Fonts: Font Awesome
 Changelog
 ----
 1.2.10
+* Fix: Broken site-nav children menu
 * Tweak: Buttons, Input, Alert style
 
 1.2.9
+* Add: Option to use both title & logo
 * Fix: Dropdown menu bug: http://wordpress.org/support/topic/dropdown-menu-bug
 
 1.2.8