mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-01 01:21:49 +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

4
scss/_button-group.scss
View File

@@ -136,12 +136,12 @@
} }
// Carets in other button sizes // Carets in other button sizes
.btn-lg .caret { .btn-lg .caret {
border-width: $caret-width-large $caret-width-large 0; border-width: $caret-width-lg $caret-width-lg 0;
border-bottom-width: 0; border-bottom-width: 0;
} }
// Upside down carets for .dropup // Upside down carets for .dropup
.dropup .btn-lg .caret { .dropup .btn-lg .caret {
border-width: 0 $caret-width-large $caret-width-large; border-width: 0 $caret-width-lg $caret-width-lg;
} }

8
scss/_buttons.scss
View File

@@ -17,7 +17,7 @@
cursor: pointer; cursor: pointer;
user-select: none; user-select: none;
border: $border-width solid transparent; border: $border-width solid transparent;
@include button-size($padding-base-vertical, $padding-base-horizontal, $font-size-base, $line-height-base, $btn-border-radius-base); @include button-size($padding-base-y, $padding-base-x, $font-size-base, $line-height-base, $btn-border-radius-base);
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
&, &,
@@ -130,14 +130,14 @@ fieldset[disabled] a.btn {
.btn-lg { .btn-lg {
// line-height: ensure even-numbered height of button next to large input // line-height: ensure even-numbered height of button next to large input
@include button-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $btn-border-radius-lg); @include button-size($padding-lg-y, $padding-lg-x, $font-size-lg, $line-height-lg, $btn-border-radius-lg);
} }
.btn-sm { .btn-sm {
// line-height: ensure proper height of button next to small input // line-height: ensure proper height of button next to small input
@include button-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $btn-border-radius-sm); @include button-size($padding-sm-y, $padding-sm-x, $font-size-sm, $line-height-sm, $btn-border-radius-sm);
} }
.btn-xs { .btn-xs {
@include button-size($padding-xs-vertical, $padding-xs-horizontal, $font-size-xs, $line-height-sm, $btn-border-radius-sm); @include button-size($padding-xs-y, $padding-xs-x, $font-size-xs, $line-height-sm, $btn-border-radius-sm);
} }

12
scss/_forms.scss
View File

@@ -12,7 +12,7 @@
width: 100%; width: 100%;
// // Make inputs at least the height of their button counterpart (base line-height + padding + border) // // Make inputs at least the height of their button counterpart (base line-height + padding + border)
// height: $input-height-base; // height: $input-height-base;
padding: $padding-base-vertical $padding-base-horizontal; padding: $padding-base-y $padding-base-x;
font-size: $font-size-base; font-size: $font-size-base;
line-height: $line-height-base; line-height: $line-height-base;
color: $input-color; color: $input-color;
@@ -83,7 +83,7 @@
// For use with horizontal and inline forms, when you need the label text to // For use with horizontal and inline forms, when you need the label text to
// align with the form controls. // align with the form controls.
.form-control-label { .form-control-label {
padding: ($padding-base-vertical + $border-width) $padding-base-horizontal; padding: ($padding-base-y + $border-width) $padding-base-x;
margin-bottom: 0; // Override the `<label>` default margin-bottom: 0; // Override the `<label>` default
} }
@@ -127,8 +127,8 @@
.form-control-static { .form-control-static {
min-height: $input-height-base; min-height: $input-height-base;
// Size it appropriately next to real form controls // Size it appropriately next to real form controls
padding-top: ($padding-base-vertical + $border-width); padding-top: ($padding-base-y + $border-width);
padding-bottom: ($padding-base-vertical + $border-width); padding-bottom: ($padding-base-y + $border-width);
// Remove default margin from `p` // Remove default margin from `p`
margin-bottom: 0; margin-bottom: 0;
@@ -150,7 +150,7 @@
.form-control-sm { .form-control-sm {
height: $input-height-sm; height: $input-height-sm;
padding: $padding-sm-vertical $padding-sm-horizontal; padding: $padding-sm-y $padding-sm-x;
font-size: $font-size-sm; font-size: $font-size-sm;
line-height: $line-height-sm; line-height: $line-height-sm;
border-radius: $input-border-radius-sm; border-radius: $input-border-radius-sm;
@@ -158,7 +158,7 @@
.form-control-lg { .form-control-lg {
height: $input-height-lg; height: $input-height-lg;
padding: $padding-lg-vertical $padding-lg-horizontal; padding: $padding-lg-y $padding-lg-x;
font-size: $font-size-lg; font-size: $font-size-lg;
line-height: $line-height-lg; line-height: $line-height-lg;
border-radius: $input-border-radius-lg; border-radius: $input-border-radius-lg;

6
scss/_input-group.scss
View File

@@ -85,7 +85,7 @@
// //
.input-group-addon { .input-group-addon {
padding: $padding-base-vertical $padding-base-horizontal; padding: $padding-base-y $padding-base-x;
font-size: $font-size-base; font-size: $font-size-base;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;
@@ -97,12 +97,12 @@
// Sizing // Sizing
&.form-control-sm { &.form-control-sm {
padding: $padding-sm-vertical $padding-sm-horizontal; padding: $padding-sm-y $padding-sm-x;
font-size: $font-size-sm; font-size: $font-size-sm;
@include border-radius($border-radius-sm); @include border-radius($border-radius-sm);
} }
&.form-control-lg { &.form-control-lg {
padding: $padding-lg-vertical $padding-lg-horizontal; padding: $padding-lg-y $padding-lg-x;
font-size: $font-size-lg; font-size: $font-size-lg;
@include border-radius($border-radius-lg); @include border-radius($border-radius-lg);
} }

6
scss/_pagination.scss
View File

@@ -17,7 +17,7 @@
> span { > span {
position: relative; position: relative;
float: left; // Collapse white-space float: left; // Collapse white-space
padding: $padding-base-vertical $padding-base-horizontal; padding: $padding-base-y $padding-base-x;
margin-left: -1px; margin-left: -1px;
line-height: $line-height-base; line-height: $line-height-base;
color: $pagination-color; color: $pagination-color;
@@ -79,9 +79,9 @@
// //
.pagination-lg { .pagination-lg {
@include pagination-size($padding-lg-vertical, $padding-lg-horizontal, $font-size-lg, $line-height-lg, $border-radius-lg); @include pagination-size($padding-lg-y, $padding-lg-x, $font-size-lg, $line-height-lg, $border-radius-lg);
} }
.pagination-sm { .pagination-sm {
@include pagination-size($padding-sm-vertical, $padding-sm-horizontal, $font-size-sm, $line-height-sm, $border-radius-sm); @include pagination-size($padding-sm-y, $padding-sm-x, $font-size-sm, $line-height-sm, $border-radius-sm);
} }

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