From: Prem Mariappan <prem@vitessewebdesign.com.au>
Date: Mon, 11 Mar 2013 13:16:53 +0000 (+1100)
Subject: Fixing recent merge pull causing $topbar-link-color to be ignored
X-Git-Tag: v4.0.6~22^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1833%2Fhead;p=thirdparty%2Ffoundation%2Ffoundation-sites.git

Fixing recent merge pull causing $topbar-link-color to be ignored

A recent merge pull (https://github.com/zurb/foundation/pull/1730)
causing $topbar-link-color to be ignored but
$topbar-dropdown-link-color to be used instead for the topbar link
color.  These changes honor the intention of $topbar-link-color and
$topbar-dropdown-link-color;
---

diff --git a/scss/foundation/components/_top-bar.scss b/scss/foundation/components/_top-bar.scss
index 286efce12..8f29e2907 100644
--- a/scss/foundation/components/_top-bar.scss
+++ b/scss/foundation/components/_top-bar.scss
@@ -208,7 +208,7 @@ $topbar-media-query: "only screen and (min-width:"#{$topbar-breakpoint}")" !defa
     & > a {
       display: block;
       width: 100%;
-      color: $topbar-dropdown-link-color;
+      color: $topbar-link-color;
       padding: 12px 0 12px 0;
       padding-#{$default-float}: $topbar-height / 3;
       font-size: $topbar-link-font-size;
@@ -405,6 +405,7 @@ $topbar-media-query: "only screen and (min-width:"#{$topbar-breakpoint}")" !defa
 
       li {
         a {
+          color: $topbar-dropdown-link-color;
           line-height: 1;
           white-space: nowrap;
           padding: 7px $topbar-height / 3;