From 7bbb7b742cc2cbc6242329e225ceefa7a53addbe Mon Sep 17 00:00:00 2001
From: Bill Parrott <bill@chimericdream.com>
Date: Mon, 3 Dec 2012 13:46:54 -0600
Subject: [PATCH] add "\!default" where it is missing in _variables.scss [fixes
 #261]

---
 .../stylesheets/bootstrap/_variables.scss     | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/vendor/assets/stylesheets/bootstrap/_variables.scss b/vendor/assets/stylesheets/bootstrap/_variables.scss
index 935f786bde..f41ac1983c 100644
--- a/vendor/assets/stylesheets/bootstrap/_variables.scss
+++ b/vendor/assets/stylesheets/bootstrap/_variables.scss
@@ -62,17 +62,17 @@ $headingsColor:         inherit !default; // empty to use BS default, $textColor
 // -------------------------
 // Based on 14px font-size and 20px line-height
 
-$fontSizeLarge:         $baseFontSize * 1.25; // ~18px
-$fontSizeSmall:         $baseFontSize * 0.85; // ~12px
-$fontSizeMini:          $baseFontSize * 0.75; // ~11px
+$fontSizeLarge:         $baseFontSize * 1.25 !default; // ~18px
+$fontSizeSmall:         $baseFontSize * 0.85 !default; // ~12px
+$fontSizeMini:          $baseFontSize * 0.75 !default; // ~11px
 
-$paddingLarge:          11px 19px; // 44px
-$paddingSmall:          2px 10px;  // 26px
-$paddingMini:           1px 6px;   // 24px
+$paddingLarge:          11px 19px !default; // 44px
+$paddingSmall:          2px 10px !default;  // 26px
+$paddingMini:           1px 6px !default;   // 24px
 
-$baseBorderRadius:      4px;
-$borderRadiusLarge:     6px;
-$borderRadiusSmall:     3px;
+$baseBorderRadius:      4px !default;
+$borderRadiusLarge:     6px !default;
+$borderRadiusSmall:     3px !default;
 
 
 // Tables
@@ -114,7 +114,7 @@ $inputBorder:                   #ccc !default;
 $inputBorderRadius:             $baseBorderRadius !default;
 $inputDisabledBackground:       $grayLighter !default;
 $formActionsBackground:         #f5f5f5 !default;
-$inputHeight:                   $baseLineHeight + 10px; // base line-height + 8px vertical padding + 2px top/bottom border
+$inputHeight:                   $baseLineHeight + 10px !default; // base line-height + 8px vertical padding + 2px top/bottom border
 
 
 // Dropdowns
@@ -167,7 +167,7 @@ $hrBorder:                $grayLighter !default;
 
 // Horizontal forms & lists
 // -------------------------
-$horizontalComponentOffset:       180px;
+$horizontalComponentOffset:       180px !default;
 
 
 // Wells
@@ -178,7 +178,7 @@ $wellBackground:                  #f5f5f5 !default;
 // Navbar
 // -------------------------
 $navbarCollapseWidth:             979px !default;
-$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1;
+$navbarCollapseDesktopWidth:      $navbarCollapseWidth + 1 !default;
 
 $navbarHeight:                    40px !default;
 $navbarBackgroundHighlight:       #ffffff !default;