grunt

1 files changed, 13 insertions, 18 deletions

diff --git a/dist/css/bootstrap-flex.css b/dist/css/bootstrap-flex.css
index 81a65e5c8..d2b4b39b2 100644
--- a/dist/css/bootstrap-flex.css
+++ b/dist/css/bootstrap-flex.css
@@ -2265,17 +2265,12 @@ pre code {
   color: #55595c;
   background-color: #fff;
   background-image: none;
-  border: 1px solid #ccc;
+  border: .0625rem solid #ccc;
   border-radius: .25rem;
   -webkit-transition: border-color ease-in-out .15s, -webkit-box-shadow ease-in-out .15s;
        -o-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
           transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
 }
-.form-control:not(textarea),
-  .form-control:not(select[size]),
-  .form-control:not(select[multiple]) {
-  height: 2.625rem;
-}
 .form-control::-ms-expand {
   background-color: transparent;
   border: 0;
@@ -2336,7 +2331,7 @@ pre code {
   .input-group-sm input[type="datetime-local"].form-control,
   input[type="month"].input-sm,
   .input-group-sm input[type="month"].form-control {
-    line-height: 2rem;
+    line-height: 1.95rem;
   }
   input[type="date"].input-lg,
   .input-group-lg input[type="date"].form-control,
@@ -2370,8 +2365,8 @@ pre code {
 .form-control-sm, .input-group-sm > .form-control,
 .input-group-sm > .input-group-addon,
 .input-group-sm > .input-group-btn > .btn {
-  height: 2rem;
-  padding: .3rem .75rem;
+  height: 1.95rem;
+  padding: .275rem .75rem;
   font-size: .85rem;
   line-height: 1.5;
   border-radius: .2rem;
@@ -2492,9 +2487,9 @@ fieldset[disabled] .checkbox label {
 
 .input-sm + .form-control-feedback,
 .input-group-sm + .form-control-feedback {
-  width: 2rem;
-  height: 2rem;
-  line-height: 2rem;
+  width: 1.95rem;
+  height: 1.95rem;
+  line-height: 1.95rem;
 }
 
 .has-success .help-block,
@@ -3069,7 +3064,7 @@ fieldset[disabled] a.btn {
 }
 
 .btn-sm, .btn-group-sm > .btn {
-  padding: .3rem .75rem;
+  padding: .275rem .75rem;
   font-size: .85rem;
   line-height: 1.5;
   border-radius: .2rem;
@@ -3502,7 +3497,7 @@ input[type="button"].btn-block {
 }
 .input-group-addon.form-control-sm, .input-group-sm > .input-group-addon,
   .input-group-sm > .input-group-btn > .input-group-addon.btn {
-  padding: .3rem .75rem;
+  padding: .275rem .75rem;
   font-size: .85rem;
   border-radius: .2rem;
 }
@@ -4069,15 +4064,15 @@ input[type="button"].btn-block {
   border-bottom-left-radius: 0;
 }
 
-.navbar-condensed {
+.navbar-sm {
   padding-top: 0;
   padding-bottom: 0;
 }
-.navbar-condensed .navbar-brand {
+.navbar-sm .navbar-brand {
   padding-top: .95rem;
   padding-bottom: .95rem;
 }
-.navbar-condensed .form-inline {
+.navbar-sm .form-inline {
   margin-top: .6rem;
 }
 
@@ -4525,7 +4520,7 @@ input[type="button"].btn-block {
 
 .pagination-sm > li > a,
 .pagination-sm > li > span {
-  padding: .3rem .75rem;
+  padding: .275rem .75rem;
   font-size: .85rem;
   line-height: 1.5;
 }