0
0
mirror of https://github.com/twbs/bootstrap.git synced 2024-12-01 13:24:25 +01:00

Makes inputs and buttons align middle so they line up in all browsers

This commit is contained in:
Pete Hopkins 2012-01-26 16:02:27 -05:00
parent f76444c858
commit b9413460af
3 changed files with 9 additions and 9 deletions

View File

@ -66,9 +66,9 @@
.btn { .btn {
// Button Base // Button Base
display: inline-block; display: inline-block;
padding: 5px 10px 6px; padding: 4px 10px 4px;
font-size: @baseFontSize; font-size: @baseFontSize;
line-height: normal; line-height: @baseLineHeight;
color: @grayDark; color: @grayDark;
text-shadow: 0 1px 1px rgba(255,255,255,.75); text-shadow: 0 1px 1px rgba(255,255,255,.75);
#gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient #gradient > .vertical-three-colors(@white, @white, 25%, darken(@white, 10%)); // Don't use .gradientbar() here since it does a three-color gradient
@ -129,8 +129,9 @@
.border-radius(5px); .border-radius(5px);
} }
&.small { &.small {
padding: 7px 9px 7px; padding: 5px 9px 5px;
font-size: @baseFontSize - 2px; font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 2px;
} }
} }

View File

@ -119,7 +119,6 @@ input[type=file] {
// Chrome on Linux and Mobile Safari need background-color // Chrome on Linux and Mobile Safari need background-color
select { select {
width: 220px; // default input width + 10px of padding that doesn't get applied width: 220px; // default input width + 10px of padding that doesn't get applied
vertical-align: baseline;
background-color: @white; background-color: @white;
} }
@ -377,9 +376,9 @@ select:focus:required:invalid {
} }
.help-inline { .help-inline {
*position: relative; /* IE6-7 */ display: inline-block;
*top: -5px; /* IE6-7 */ margin-bottom: 9px;
display: inline; vertical-align: middle;
padding-left: 5px; padding-left: 5px;
} }
@ -469,6 +468,7 @@ select:focus:required:invalid {
input, input,
textarea, textarea,
select, select,
.help-inline,
.uneditable-input { .uneditable-input {
display: inline-block; display: inline-block;
margin-bottom: 0; margin-bottom: 0;

View File

@ -91,8 +91,7 @@ select,
textarea { textarea {
margin: 0; margin: 0;
font-size: 100%; font-size: 100%;
vertical-align: baseline; vertical-align: middle;
*vertical-align: middle;
} }
button, button,
input { input {