Merge branch 'master' of https://github.uconn.edu/weblab/sherman

Conflicts: style.css style.scss
weblab · Aug 20, 2014 · 2bb35a1 · 2bb35a1
2 parents 74d2fd3 + d5aa16e
commit 2bb35a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/style.css b/style.css
@@ -7958,7 +7958,7 @@ body {
   border: 6px solid transparent;
   border-bottom-color: #e9e9e9;
 }
-#masthead #site-navigation .navbar-collapse .nav li.current-menu-parent a.dropdown-toggle {
+#masthead #site-navigation .navbar-collapse .nav li.current-menu-ancestor a.dropdown-toggle {
   color: white;
 }
 #masthead #site-navigation .navbar-collapse .nav .dropdown-menu {
@@ -7995,7 +7995,7 @@ body {
 }
 
 #masthead #site-navigation .navbar-collapse .nav > li.active:after,
-#masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
+#masthead #site-navigation .navbar-collapse .nav > li.current-menu-ancestor:after {
   -moz-border-bottom-colors: none;
   -moz-border-left-colors: none;
   -moz-border-right-colors: none;

diff --git a/style.scss b/style.scss
@@ -108,7 +108,7 @@ body {
 					border-bottom-color:$dropdown-bg;
 				}
 
-				li.current-menu-parent a.dropdown-toggle {
+				li.current-menu-ancestor a.dropdown-toggle {
 					color:white;
 				}
 
@@ -167,7 +167,7 @@ body {
 }
 
 #masthead #site-navigation .navbar-collapse .nav > li.active:after, 
-#masthead #site-navigation .navbar-collapse .nav > li.current-menu-parent:after {
+#masthead #site-navigation .navbar-collapse .nav > li.current-menu-ancestor:after {
 	-moz-border-bottom-colors: none;
     -moz-border-left-colors: none;
     -moz-border-right-colors: none;