mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-31 00:59:51 +02:00
Code Issues Releases Wiki Activity

nuke the shared padding vars and assign to individual components

Browse Source 
- no real need for everything to be 100% shared
- padding looked and felt too large for inputs but not for buttons
- tying forms and buttons seems fine, but throwing in pagination feels wrong
This commit is contained in:
Mark Otto
2015-08-13 23:04:16 -07:00
parent 879114a808
commit 9b1ee31567
15 changed files with 64 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scss/_forms.scss
View File

@@ -12,7 +12,7 @@
width: 100%;
// // Make inputs at least the height of their button counterpart (base line-height + padding + border)
// height: $input-height;
padding: $padding-y $padding-x;
padding: $input-padding-y $input-padding-x;
font-size: $font-size-base;
line-height: $line-height;
color: $input-color;
@@ -83,7 +83,7 @@
// For use with horizontal and inline forms, when you need the label text to
// align with the form controls.
.form-control-label {
padding: ($padding-y + $border-width) $padding-x;
padding: ($input-padding-y + $border-width) $input-padding-x;
margin-bottom: 0; // Override the `<label>` default
}
@@ -127,8 +127,8 @@
.form-control-static {
min-height: $input-height;
// Size it appropriately next to real form controls
padding-top: ($padding-y + $border-width);
padding-bottom: ($padding-y + $border-width);
padding-top: ($input-padding-y + $border-width);
padding-bottom: ($input-padding-y + $border-width);
// Remove default margin from `p`
margin-bottom: 0;
@@ -150,7 +150,7 @@
.form-control-sm {
height: $input-height-sm;
padding: $padding-sm-y $padding-sm-x;
padding: $input-padding-y-sm $input-padding-x-sm;
font-size: $font-size-sm;
line-height: $line-height-sm;
border-radius: $input-border-radius-sm;
@@ -158,7 +158,7 @@
.form-control-lg {
height: $input-height-lg;
padding: $padding-lg-y $padding-lg-x;
padding: $input-padding-y-lg $input-padding-x-lg;
font-size: $font-size-lg;
line-height: $line-height-lg;
border-radius: $input-border-radius-lg;
@@ -270,7 +270,7 @@ input[type="checkbox"] {
.form-control-success,
.form-control-warning,
.form-control-error {
padding-right: ($padding-x * 3);
padding-right: ($input-padding-x * 3);
background-position: center right ($input-height * .25);
background-size: ($input-height * .65) ($input-height * .65);
background-repeat: no-repeat;