From: Mark Otto <markd.otto@gmail.com>
Date: Thu, 11 Dec 2014 20:20:05 +0000 (-0800)
Subject: Merge pull request #13 from twbs/default-vars
X-Git-Tag: v4.0.0-alpha~496
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=826aeec6e8a3b51ff98f1c6ee4c9ee01eb19701f;p=thirdparty%2Fbootstrap.git

Merge pull request #13 from twbs/default-vars

Apply !default to SCSS variables
---

826aeec6e8a3b51ff98f1c6ee4c9ee01eb19701f
diff --cc scss/_variables.scss
index 8f9e26d68d,95eb4b2a7e..f981933b08
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@@ -294,16 -294,16 +294,16 @@@ $screen-xs-max:              ($screen-s
  //== Grid system
  //
  //## Define your custom responsive grid.
 -
 +$grid-breakpoints: (xs sm md lg xl);
  //** Number of columns in the grid.
- $grid-columns:               12;
+ $grid-columns:               12 !default;
  //** Padding between columns. Gets divided in half for the left and right.
- $grid-gutter-width:          1.5rem;
+ $grid-gutter-width:          1.5rem !default;
  // Navbar collapse
  //** Point at which the navbar becomes uncollapsed.
- $grid-float-breakpoint:      $screen-sm-min;
+ $grid-float-breakpoint:      $screen-sm-min !default;
  //** Point at which the navbar begins collapsing.
- $grid-float-breakpoint-max:  ($grid-float-breakpoint - 1);
+ $grid-float-breakpoint-max:  ($grid-float-breakpoint - 1) !default;
  
  
  //== Container sizes