mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-29 16:19:53 +02:00
Code Issues Releases Wiki Activity

drop the base (hahaha), no but seriously drop the -base from our vars since it's cleaner

Browse Source
This commit is contained in:
Mark Otto
2015-06-22 18:53:04 -07:00
parent d703396bce
commit 0ca9b21c34
13 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scss/_forms.scss
View File

@@ -11,7 +11,7 @@
display: block;
width: 100%;
// // Make inputs at least the height of their button counterpart (base line-height + padding + border)
// height: $input-height-base;
// height: $input-height;
padding: $padding-base-y $padding-base-x;
font-size: $font-size-base;
line-height: $line-height-base;
@@ -30,7 +30,7 @@
// &:not(textarea),
// &:not(select[size]),
// &:not(select[multiple]) {
// height: $input-height-base;
// height: $input-height;
// }
// Unstyle the caret on `<select>`s in IE10+.
@@ -103,7 +103,7 @@
input[type="datetime-local"],
input[type="month"] {
&.form-control {
line-height: $input-height-base;
line-height: $input-height;
}
&.input-sm,
@@ -125,7 +125,7 @@
// horizontal form layout.
.form-control-static {
min-height: $input-height-base;
min-height: $input-height;
// Size it appropriately next to real form controls
padding-top: ($padding-base-y + $border-width);
padding-bottom: ($padding-base-y + $border-width);
@@ -273,7 +273,7 @@ input[type="checkbox"] {
// Ensure icons don't overlap text
.form-control {
padding-right: ($input-height-base * 1.25);
padding-right: ($input-height * 1.25);
}
}
// Feedback icon
@@ -283,9 +283,9 @@ input[type="checkbox"] {
right: 0;
z-index: 2; // Ensure icon is above input groups
display: block;
width: $input-height-base;
height: $input-height-base;
line-height: $input-height-base;
width: $input-height;
height: $input-height;
line-height: $input-height;
text-align: center;
pointer-events: none;
}