Fix top nav highlighting for polyfill and native

frunjik · Jun 29, 2014 · 9a2e0f3 · 9a2e0f3
1 parent ef9af91
commit 9a2e0f3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/_includes/top-nav.html b/_includes/top-nav.html
@@ -7,7 +7,7 @@
 {% endcapture %}
 
 <app-bar theme="{{theme | trim }}" class="bar fixed" unresolved>
-  <a href="/docs/start/tutorial/intro.html" class="paper-button {% if page.navgroup == 'docs' %}active{% endif %}" borderless sink>Learn</a>
+  <a href="/docs/start/tutorial/intro.html" class="paper-button {% if page.navgroup == 'docs'%}active{% elsif page.navgroup == 'start' %}active{% endif %}" borderless sink>Learn</a>
   <a href="/docs/elements/" class="paper-button {% if page.navgroup == 'elements' %}active{% endif %}" borderless sink>Elements</a>
   <a href="/resources/faq.html" class="paper-button {% if page.navgroup == 'resources' %}active{% endif %}" borderless sink>Resources</a>
 </app-bar>
diff --git a/css/elements/app-bar.css b/css/elements/app-bar.css
diff --git a/sass/elements/app-bar.scss b/sass/elements/app-bar.scss
@@ -20,16 +20,15 @@
   color: inherit;
 }
 
-:host-context(site-banner[type="start"], site-banner[navgroup="resources"]) ::content .active,
-:host-context(site-banner[type="start"], site-banner[navgroup="resources"]) ::content .paper-button:hover {
+:host-context(site-banner[navgroup="start"], site-banner[type="start"], site-banner[navgroup="resources"]) ::content .active,
+:host-context(site-banner[navgroup="start"], site-banner[type="start"], site-banner[navgroup="resources"]) ::content .paper-button:hover {
   box-shadow: 0 1px 1px rgba(0, 0, 0, 1) inset, 0 -1px 1px rgba(0, 0, 0, 1) inset, 0 2px 0px rgba(0, 0, 0, 1) inset;
   @include background(linear-gradient(to bottom, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.8) 40%));
 }
 
-// TODO(ericbidelman): check with sorvell if :ancestor() is polyfill'd correctly.
 // The above is prefixed with the element name.
 polyfill-unscoped-rule {
-  content: 'site-banner[navgroup="start"] app-bar .active, site-banner[navgroup="resources"] app-bar .active, site-banner[navgroup="community"] app-bar .active, site-banner[navgroup="start"] app-bar .paper-button:hover, site-banner[navgroup="resources"] app-bar .paper-button:hover, site-banner[navgroup="community"] app-bar .paper-button:hover';
+  content: 'site-banner[navgroup="start"] app-bar .active, site-banner[type="start"] app-bar .active, site-banner[navgroup="resources"] app-bar .active, site-banner[navgroup="start"] app-bar .paper-button:hover, site-banner[type="start"] app-bar .paper-button:hover, site-banner[navgroup="resources"] app-bar .paper-button:hover';
   box-shadow: 0 1px 1px rgba(0, 0, 0, 1) inset, 0 -1px 1px rgba(0, 0, 0, 1) inset, 0 2px 0px rgba(0, 0, 0, 1) inset  !important;
   background: -webkit-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.8) 40%)  !important;
   background: -moz-linear-gradient(top, rgba(0, 0, 0, 0) 0%, rgba(0, 0, 0, 0.8) 40%)  !important;