From 3111a85f81a3fb53c7e1259d4a7d298b58d5ccfc Mon Sep 17 00:00:00 2001
From: Thomas Park <thomas@thomaspark.co>
Date: Tue, 24 Nov 2015 18:28:55 -0500
Subject: update bootstrap to 3.3.6

---
 .../assets/stylesheets/bootstrap/_forms.scss                 | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss')

diff --git a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
index de4befdb..11ba1096 100644
--- a/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
+++ b/bower_components/bootstrap-sass-official/assets/stylesheets/bootstrap/_forms.scss
@@ -132,6 +132,12 @@ output {
   // Placeholder
   @include placeholder;
 
+  // Unstyle the caret on `<select>`s in IE10+.
+  &::-ms-expand {
+    border: 0;
+    background-color: transparent;
+  }
+
   // Disabled and read-only inputs
   //
   // HTML5 says that controls under a fieldset > legend:first-child won't be
@@ -431,10 +437,10 @@ input[type="checkbox"] {
 .has-feedback label {
 
   & ~ .form-control-feedback {
-     top: ($line-height-computed + 5); // Height of the `label` and its margin
+    top: ($line-height-computed + 5); // Height of the `label` and its margin
   }
   &.sr-only ~ .form-control-feedback {
-     top: 0;
+    top: 0;
   }
 }
 
@@ -595,7 +601,7 @@ input[type="checkbox"] {
   .form-group-lg {
     @media (min-width: $screen-sm-min) {
       .control-label {
-        padding-top: (($padding-large-vertical * $line-height-large) + 1);
+        padding-top: ($padding-large-vertical + 1);
         font-size: $font-size-large;
       }
     }
-- 
cgit v1.2.3