From 67a96df22d472032ecadaecb55a0e33030506607 Mon Sep 17 00:00:00 2001 From: Prem Mariappan Date: Tue, 12 Mar 2013 00:16:53 +1100 Subject: [PATCH] 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; --- scss/foundation/components/_top-bar.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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; -- 2.47.3