Fixes #8605: use `.form-control` in `.input-group` instead of HTML tags

444973e5 · Mark Otto · 5dd2bff3 · 444973e5 · 444973e5 · 444973e5
Commit 444973e5 authored 11 years ago by Mark Otto
Expand all Hide whitespace changes
Inline Side-by-side

Showing

with 10 additions and 12 deletions
+10 -12
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -1576,21 +1576,20 @@ select.input-small {
  padding-left: 0;
 }

-.input-group input,
-.input-group select {
+.input-group .form-control {
  width: 100%;
  margin-bottom: 0;
 }

 .input-group-addon,
 .input-group-btn,
-.input-group input {
+.input-group .form-control {
  display: table-cell;
 }

 .input-group-addon:not(:first-child):not(:last-child),
 .input-group-btn:not(:first-child):not(:last-child),
-.input-group input:not(:first-child):not(:last-child) {
+.input-group .form-control:not(:first-child):not(:last-child) {
  border-radius: 0;
 }

@@ -1627,7 +1626,7 @@ select.input-small {
  border-radius: 6px;
 }

-.input-group input:first-child,
+.input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
@@ -1640,7 +1639,7 @@ select.input-small {
  border-right: 0;
 }

-.input-group input:last-child,
+.input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
 .input-group-btn:last-child > .dropdown-toggle,

--- a/dist/css/bootstrap.min.css
+++ b/dist/css/bootstrap.min.css
--- a/less/forms.less
+++ b/less/forms.less
@@ -306,8 +306,7 @@ select {
    padding-right: 0;
  }

-  input,
-  select {
+  .form-control {
    width: 100%;
    margin-bottom: 0;
  }
@@ -317,7 +316,7 @@ select {
 // -------------------------
 .input-group-addon,
 .input-group-btn,
-.input-group input {
+.input-group .form-control {
  display: table-cell;

  &:not(:first-child):not(:last-child) {
@@ -358,7 +357,7 @@ select {
 }

 // Reset rounded corners
-.input-group input:first-child,
+.input-group .form-control:first-child,
 .input-group-addon:first-child,
 .input-group-btn:first-child > .btn,
 .input-group-btn:first-child > .dropdown-toggle,
@@ -368,7 +367,7 @@ select {
 .input-group-addon:first-child {
  border-right: 0;
 }
-.input-group input:last-child,
+.input-group .form-control:last-child,
 .input-group-addon:last-child,
 .input-group-btn:last-child > .btn,
 .input-group-btn:last-child > .dropdown-toggle,