rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-07 04:54:24 +01:00
Code Issues Actions Packages Releases Activity

fixes #4260 and #4322: set vertical-align to top on input-prepend components to solve modal rounding issues

Browse Source
This commit is contained in:
Mark Otto 2012-08-17 16:28:45 -07:00
parent 5b947b8a2f
commit 256a25f25c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/assets/css/bootstrap.css vendored
View File

@ -1471,7 +1471,7 @@ select:focus:required:invalid:focus {
margin-bottom: 0; margin-bottom: 0;
*margin-left: 0; *margin-left: 0;
font-size: 14px; font-size: 14px;
vertical-align: middle; vertical-align: top;
-webkit-border-radius: 0 3px 3px 0; -webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0; -moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0; border-radius: 0 3px 3px 0;
@ -1498,7 +1498,6 @@ select:focus:required:invalid:focus {
line-height: 20px; line-height: 20px;
text-align: center; text-align: center;
text-shadow: 0 1px 0 #ffffff; text-shadow: 0 1px 0 #ffffff;
vertical-align: middle;
background-color: #eeeeee; background-color: #eeeeee;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
@ -1508,6 +1507,7 @@ select:focus:required:invalid:focus {
.input-append .btn, .input-append .btn,
.input-prepend .btn { .input-prepend .btn {
margin-left: -1px; margin-left: -1px;
vertical-align: top;
-webkit-border-radius: 0; -webkit-border-radius: 0;
-moz-border-radius: 0; -moz-border-radius: 0;
border-radius: 0; border-radius: 0;

4
less/forms.less
View File

@ -417,7 +417,7 @@ select:focus:required:invalid {
margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms margin-bottom: 0; // prevent bottom margin from screwing up alignment in stacked forms
*margin-left: 0; *margin-left: 0;
font-size: @baseFontSize; font-size: @baseFontSize;
vertical-align: middle; vertical-align: top;
.border-radius(0 @inputBorderRadius @inputBorderRadius 0); .border-radius(0 @inputBorderRadius @inputBorderRadius 0);
// Make input on top when focused so blue border and shadow always show // Make input on top when focused so blue border and shadow always show
&:focus { &:focus {
@ -435,13 +435,13 @@ select:focus:required:invalid {
line-height: @baseLineHeight; line-height: @baseLineHeight;
text-align: center; text-align: center;
text-shadow: 0 1px 0 @white; text-shadow: 0 1px 0 @white;
vertical-align: middle;
background-color: @grayLighter; background-color: @grayLighter;
border: 1px solid #ccc; border: 1px solid #ccc;
} }
.add-on, .add-on,
.btn { .btn {
margin-left: -1px; margin-left: -1px;
vertical-align: top;
.border-radius(0); .border-radius(0);
} }
.active { .active {