From 3edd90db06eed341b018b4434e6efa02ec295cd7 Mon Sep 17 00:00:00 2001 From: Alejandro Iglesias Date: Thu, 28 May 2015 23:54:13 -0300 Subject: [PATCH] Add !default keyword to Sass variables This allows more flexibility for overriding through a variables config file. --- scss/bootstrap-progressbar-2.x.x.scss | 4 ++-- scss/bootstrap-progressbar-3.0.0-3.1.x.scss | 4 ++-- scss/bootstrap-progressbar-3.2.0.scss | 4 ++-- scss/bootstrap-progressbar-3.3.0-3.x.x.scss | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scss/bootstrap-progressbar-2.x.x.scss b/scss/bootstrap-progressbar-2.x.x.scss index 739faf5..5007722 100644 --- a/scss/bootstrap-progressbar-2.x.x.scss +++ b/scss/bootstrap-progressbar-2.x.x.scss @@ -1,5 +1,5 @@ -$progressbarVerticalWidth: $baseLineHeight; -$progressbarFontSize: 12px; +$progressbarVerticalWidth: $baseLineHeight !default; +$progressbarFontSize: 12px !default; // bootstrap-progressbar global styles // ----------------------------------- diff --git a/scss/bootstrap-progressbar-3.0.0-3.1.x.scss b/scss/bootstrap-progressbar-3.0.0-3.1.x.scss index b14d5ba..771c773 100644 --- a/scss/bootstrap-progressbar-3.0.0-3.1.x.scss +++ b/scss/bootstrap-progressbar-3.0.0-3.1.x.scss @@ -1,5 +1,5 @@ -$progressbarVerticalWidth: $line-height-computed; -$progressbarFontSize: $font-size-small; +$progressbarVerticalWidth: $line-height-computed !default; +$progressbarFontSize: $font-size-small !default; // bootstrap-progressbar global styles // ----------------------------------- diff --git a/scss/bootstrap-progressbar-3.2.0.scss b/scss/bootstrap-progressbar-3.2.0.scss index ced685c..b74c560 100644 --- a/scss/bootstrap-progressbar-3.2.0.scss +++ b/scss/bootstrap-progressbar-3.2.0.scss @@ -1,5 +1,5 @@ -$progressbarVerticalWidth: $line-height-computed; -$progressbarFontSize: $font-size-small; +$progressbarVerticalWidth: $line-height-computed !default; +$progressbarFontSize: $font-size-small !default; // bootstrap-progressbar global styles // ----------------------------------- diff --git a/scss/bootstrap-progressbar-3.3.0-3.x.x.scss b/scss/bootstrap-progressbar-3.3.0-3.x.x.scss index b14d5ba..771c773 100644 --- a/scss/bootstrap-progressbar-3.3.0-3.x.x.scss +++ b/scss/bootstrap-progressbar-3.3.0-3.x.x.scss @@ -1,5 +1,5 @@ -$progressbarVerticalWidth: $line-height-computed; -$progressbarFontSize: $font-size-small; +$progressbarVerticalWidth: $line-height-computed !default; +$progressbarFontSize: $font-size-small !default; // bootstrap-progressbar global styles // -----------------------------------