mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-08-30 16:50:00 +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

43
scss/_variables.scss
View File

@@ -161,18 +161,6 @@ $headings-color: inherit !default;
//
// Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
$padding-y: .5rem !default;
$padding-x: 1rem !default;
$padding-lg-y: .75rem !default;
$padding-lg-x: 1.5rem !default;
$padding-sm-y: .275rem !default;
$padding-sm-x: .75rem !default;
$padding-xs-y: .2rem !default;
$padding-xs-x: .5rem !default;
$line-height-lg: (4/3) !default;
$line-height-sm: 1.5 !default;
@@ -206,6 +194,8 @@ $table-border-color: $gray-lighter !default;
//
// For each of Bootstrap's buttons, define text, background and border color.
$btn-padding-x: 1rem;
$btn-padding-y: .5rem;
$btn-font-weight: normal !default;
$btn-primary-color: #fff !default;
@@ -234,6 +224,12 @@ $btn-danger-border: $btn-danger-bg !default;
$btn-link-disabled-color: $gray-light !default;
$btn-padding-x-sm: .75rem !default;
$btn-padding-y-sm: .275rem !default;
$btn-padding-x-lg: 1.5rem !default;
$btn-padding-y-lg: .75rem !default;
// Allows for customizing button radius independently from global border radius
$btn-border-radius: $border-radius;
$btn-border-radius-lg: $border-radius-lg;
@@ -242,6 +238,9 @@ $btn-border-radius-sm: $border-radius-sm;
// Forms
$input-padding-x: .75rem !default;
$input-padding-y: .5rem !default;
$input-bg: #fff !default;
$input-bg-disabled: $gray-lighter !default;
@@ -258,9 +257,15 @@ $input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-placeholder: #999 !default;
$input-height: (($font-size-base * $line-height) + ($padding-y * 2) + ($border-width * 2)) !default;
$input-height-lg: (($font-size-lg * $line-height-lg) + ($padding-lg-y * 2) + ($border-width * 2)) !default;
$input-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-y * 2) + ($border-width * 2)) !default;
$input-padding-x-sm: .75rem !default;
$input-padding-y-sm: .275rem !default;
$input-padding-x-lg: 1.5rem !default;
$input-padding-y-lg: .75rem !default;
$input-height: (($font-size-base * $line-height) + ($input-padding-y * 2) + ($border-width * 2)) !default;
$input-height-lg: (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2) + ($border-width * 2)) !default;
$input-height-sm: (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2) + ($border-width * 2)) !default;
$form-group-margin-bottom: 15px;
@@ -391,6 +396,14 @@ $nav-pills-active-link-hover-color: $component-active-color !default;
// Pagination
$pagination-padding-x: .75rem !default;
$pagination-padding-y: .5rem !default;
$pagination-padding-x-sm: .75rem !default;
$pagination-padding-y-sm: .275rem !default;
$pagination-padding-x-lg: 1.5rem !default;
$pagination-padding-y-lg: .75rem !default;
$pagination-color: $link-color !default;
$pagination-bg: #fff !default;
$pagination-border: #ddd !default;