rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-18 10:52:19 +01:00
Code Issues Actions Packages Releases Activity

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

Browse Source
This commit is contained in:
Mark Otto 2013-07-26 14:31:24 -07:00
parent 5dd2bff38c
commit 444973e54d
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dist/css/bootstrap.css vendored
View File

@ -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,

2
dist/css/bootstrap.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
less/forms.less
View File

@ -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,