From a839232ca6b5350b96fb84ca6fb2934fad142d1e Mon Sep 17 00:00:00 2001
From: Gleb Mazovetskiy <glex.spb@gmail.com>
Date: Sun, 20 Sep 2015 02:41:14 +0200
Subject: update to 64cdb791dfa2f04bd50062b76fcf25345c073a36

---
 assets/stylesheets/bootstrap/_forms.scss       | 6 +++---
 assets/stylesheets/bootstrap/_variables.scss   | 8 ++++----
 assets/stylesheets/bootstrap/mixins/_grid.scss | 5 ++++-
 3 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'assets')

diff --git a/assets/stylesheets/bootstrap/_forms.scss b/assets/stylesheets/bootstrap/_forms.scss
index 7879f63..df28863 100644
--- a/assets/stylesheets/bootstrap/_forms.scss
+++ b/assets/stylesheets/bootstrap/_forms.scss
@@ -76,7 +76,7 @@
 // For use with horizontal and inline forms, when you need the label text to
 // align with the form controls.
 .form-control-label {
-  padding: ($input-padding-y + $border-width) $input-padding-x;
+  padding: $input-padding-y $input-padding-x;
   margin-bottom: 0; // Override the `<label>` default
 }
 
@@ -120,8 +120,8 @@
 .form-control-static {
   min-height: $input-height;
   // Size it appropriately next to real form controls
-  padding-top: ($input-padding-y + $border-width);
-  padding-bottom: ($input-padding-y + $border-width);
+  padding-top: $input-padding-y;
+  padding-bottom: $input-padding-y;
   // Remove default margin from `p`
   margin-bottom: 0;
 
diff --git a/assets/stylesheets/bootstrap/_variables.scss b/assets/stylesheets/bootstrap/_variables.scss
index b54308e..471c88f 100644
--- a/assets/stylesheets/bootstrap/_variables.scss
+++ b/assets/stylesheets/bootstrap/_variables.scss
@@ -60,7 +60,7 @@ $enable-grid-classes:       true !default;
 $spacer:                     1rem !default;
 $spacer-x:                   $spacer !default;
 $spacer-y:                   $spacer !default;
-$border-width:               .0625rem !default;
+$border-width:               1px !default;
 
 
 // Body
@@ -283,9 +283,9 @@ $input-padding-y-sm:             .275rem !default;
 $input-padding-x-lg:             1.25rem !default;
 $input-padding-y-lg:             .75rem !default;
 
-$input-height:                   (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)) !default;
-$input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default;
-$input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default;
+$input-height:                   (($font-size-base * $line-height) + ($input-padding-y * 2)) !default;
+$input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
+$input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
 
 $form-group-margin-bottom:       $spacer-y !default;
 
diff --git a/assets/stylesheets/bootstrap/mixins/_grid.scss b/assets/stylesheets/bootstrap/mixins/_grid.scss
index 87b4ac9..585c80f 100644
--- a/assets/stylesheets/bootstrap/mixins/_grid.scss
+++ b/assets/stylesheets/bootstrap/mixins/_grid.scss
@@ -7,7 +7,10 @@
   margin-left: auto;
   padding-left:  ($gutter / 2);
   padding-right: ($gutter / 2);
-  @include clearfix();
+  @if $enable-flex {
+  } @else {
+    @include clearfix();
+  }
 }
 
 
-- 
cgit v1.2.3