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

rename -horizontal and -vertical vars to -x and -y for consistency

Browse Source
This commit is contained in:
Mark Otto
2015-06-22 16:33:17 -07:00
parent 96e7ceed90
commit 4565281df3
6 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
scss/_variables.scss
View File

@@ -96,17 +96,17 @@ $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-base-vertical: .5rem !default;
$padding-base-horizontal: .75rem !default;
$padding-base-y: .5rem !default;
$padding-base-x: .75rem !default;
$padding-lg-vertical: .75rem !default;
$padding-lg-horizontal: 1.5rem !default;
$padding-lg-y: .75rem !default;
$padding-lg-x: 1.5rem !default;
$padding-sm-vertical: .275rem !default;
$padding-sm-horizontal: .75rem !default;
$padding-sm-y: .275rem !default;
$padding-sm-x: .75rem !default;
$padding-xs-vertical: .2rem !default;
$padding-xs-horizontal: .5rem !default;
$padding-xs-y: .2rem !default;
$padding-xs-x: .5rem !default;
$line-height-lg: (4/3) !default;
$line-height-sm: 1.5 !default;
@@ -119,7 +119,7 @@ $component-active-color: #fff !default;
$component-active-bg: $brand-primary !default;
$caret-width-base: .3em !default;
$caret-width-large: $caret-width-base !default;
$caret-width-lg: $caret-width-base !default;
// Tables
@@ -193,9 +193,9 @@ $input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-placeholder: #999 !default;
$input-height-base: (($font-size-base * $line-height-base) + ($padding-base-vertical * 2) + ($border-width * 2)) !default;
$input-height-lg: (($font-size-lg * $line-height-lg) + ($padding-lg-vertical * 2) + ($border-width * 2)) !default;
$input-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-vertical * 2) + ($border-width * 2)) !default;
$input-height-base: (($font-size-base * $line-height-base) + ($padding-base-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;
$form-group-margin-bottom: 15px;