From 9c393b1a860df096e03119507dd726433599d51d Mon Sep 17 00:00:00 2001 From: andrewmbacon Date: Mon, 29 Dec 2014 14:26:03 -0500 Subject: [PATCH] Moving Variables to Correct SASS should have done this long ago. --- sass/nav.scss | 19 ------------------- sass/variables.scss | 9 ++++++++- 2 files changed, 8 insertions(+), 20 deletions(-) diff --git a/sass/nav.scss b/sass/nav.scss index 34e90f7..45e95e5 100644 --- a/sass/nav.scss +++ b/sass/nav.scss @@ -1,25 +1,6 @@ /* NAV --------------------------------------------------------------*/ -// Move these to cs-variables.scss - -$nav-secondary-border-color: #ccc !default; -$nav-secondary-border-radius: $border-radius-base !default; -$nav-secondary-padding: 5px !default; -$nav-secondary-bg-color: #fff !default; -$nav-secondary-font-size: .9em !default; - -$nav-secondary-pills-padding: 5px !default; -$nav-secondary-pills-border-radius: $border-radius-base !default; -$nav-secondary-pills-link-bg: transparent !default; -$nav-secondary-pills-link-color: inherit !default; -$nav-secondary-pills-link-hover: #eee !default; - -$nav-secondary-pills-active-link-hover-bg: $component-active-bg !default; -$nav-secondary-pills-active-link-hover-color: $component-active-color !default; - - - #nav-secondary { padding: $nav-secondary-padding; diff --git a/sass/variables.scss b/sass/variables.scss index e7f84c8..e023bd6 100644 --- a/sass/variables.scss +++ b/sass/variables.scss @@ -31,7 +31,14 @@ $nav-secondary-open-link-hover-color: $nav-open-link-hover-color !default; $nav-secondary-active-link-hover-bg: $component-active-bg !default; $nav-secondary-active-link-hover-color: $component-active-color !default; - +$nav-secondary-pills-padding: 5px !default; +$nav-secondary-pills-border-radius: $border-radius-base !default; +$nav-secondary-pills-link-bg: transparent !default; +$nav-secondary-pills-link-color: inherit !default; +$nav-secondary-pills-link-hover: #eee !default; + +$nav-secondary-pills-active-link-hover-bg: $component-active-bg !default; +$nav-secondary-pills-active-link-hover-color: $component-active-color !default; /* == Widgets */