From 1770df724eaae373fd29a3fdb2b0acc5985c58de Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Thu, 23 Apr 2015 01:14:43 -0700
Subject: update input groups to use new form control size classes

---
 dist/css/bootstrap.css | 54 +++++++-------------------------------------------
 1 file changed, 7 insertions(+), 47 deletions(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 04327598a..3450caf23 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1745,12 +1745,12 @@ pre code {
   padding-bottom: .5625rem;
   margin-bottom: 0;
 }
-.form-control-static.form-control-sm, .form-control-static.form-control-lg {
+.form-control-static.form-control-sm, .input-group-sm > .form-control-static.form-control, .input-group-sm > .form-control-static.input-group-addon, .input-group-sm > .input-group-btn > .form-control-static.btn, .form-control-static.form-control-lg, .input-group-lg > .form-control-static.form-control, .input-group-lg > .form-control-static.input-group-addon, .input-group-lg > .input-group-btn > .form-control-static.btn {
   padding-right: 0;
   padding-left: 0;
 }
 
-.form-control-sm {
+.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;
   font-size: .85rem;
@@ -1758,7 +1758,7 @@ pre code {
   border-radius: .2rem;
 }
 
-.form-control-lg {
+.form-control-lg, .input-group-lg > .form-control, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .btn {
   height: 3.291667rem;
   padding: .75rem 1.5rem;
   font-size: 1.25rem;
@@ -1840,13 +1840,13 @@ input[type="radio"]:disabled, input[type="radio"].disabled, fieldset[disabled] i
   pointer-events: none;
 }
 
-.input-lg + .form-control-feedback, .input-group-lg > .form-control + .form-control-feedback, .input-group-lg > .input-group-addon + .form-control-feedback, .input-group-lg > .input-group-btn > .btn + .form-control-feedback, .input-group-lg + .form-control-feedback {
+.input-lg + .form-control-feedback, .input-group-lg + .form-control-feedback {
   width: 3.291667rem;
   height: 3.291667rem;
   line-height: 3.291667rem;
 }
 
-.input-sm + .form-control-feedback, .input-group-sm > .form-control + .form-control-feedback, .input-group-sm > .input-group-addon + .form-control-feedback, .input-group-sm > .input-group-btn > .btn + .form-control-feedback, .input-group-sm + .form-control-feedback {
+.input-sm + .form-control-feedback, .input-group-sm + .form-control-feedback {
   width: 2rem;
   height: 2rem;
   line-height: 2rem;
@@ -1966,46 +1966,6 @@ input[type="radio"]:disabled, input[type="radio"].disabled, fieldset[disabled] i
   }
 }
 
-.form-horizontal .radio, .form-horizontal .checkbox, .form-horizontal .radio-inline, .form-horizontal .checkbox-inline {
-  padding-top: .6rem;
-  margin-top: 0;
-  margin-bottom: 0;
-}
-.form-horizontal .radio, .form-horizontal .checkbox {
-  min-height: 1.6rem;
-}
-.form-horizontal .form-group {
-  margin-right: -.75rem; 
-  margin-left: -.75rem;
-}
-.form-horizontal .form-group:before, .form-horizontal .form-group:after {
-  display: table; 
-  content: " ";
-}
-.form-horizontal .form-group:after {
-  clear: both;
-}
-@media (min-width: 34em) {
-  .form-horizontal .control-label {
-    padding-top: .6rem;
-    margin-bottom: 0;
-    text-align: right;
-  }
-}
-.form-horizontal .has-feedback .form-control-feedback {
-  right: .75rem;
-}
-@media (min-width: 34em) {
-  .form-horizontal .form-group-lg .control-label {
-    padding-top: .75rem;
-  }
-}
-@media (min-width: 34em) {
-  .form-horizontal .form-group-sm .control-label {
-    padding-top: .4rem;
-  }
-}
-
 .btn {
   display: inline-block;
   padding: .5rem .75rem;
@@ -2653,12 +2613,12 @@ input[type="submit"].btn-block, input[type="reset"].btn-block, input[type="butto
   border: 1px solid #ccc;
   border-radius: .25rem;
 }
-.input-group-addon.input-sm, .input-group-sm > .input-group-addon, .input-group-sm > .input-group-btn > .input-group-addon.btn {
+.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;
   font-size: .85rem;
   border-radius: .2rem;
 }
-.input-group-addon.input-lg, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .input-group-addon.btn {
+.input-group-addon.form-control-lg, .input-group-lg > .input-group-addon, .input-group-lg > .input-group-btn > .input-group-addon.btn {
   padding: .75rem 1.5rem;
   font-size: 1.25rem;
   border-radius: .3rem;
-- 
cgit v1.2.3