rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2024-11-29 11:24:18 +01:00
Code Issues Actions Packages Releases Activity

drop more -base, clean up var spacing

Browse Source
This commit is contained in:
Mark Otto 2015-06-22 18:57:56 -07:00
parent 0ca9b21c34
commit 75cf69a1ab
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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-y, $padding-base-x, $font-size-base, $line-height-base, $btn-border-radius); @include button-size($padding-y, $padding-x, $font-size-base, $line-height-base, $btn-border-radius);
transition: all .2s ease-in-out; transition: all .2s ease-in-out;
&, &,

8
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; // height: $input-height;
padding: $padding-base-y $padding-base-x; padding: $padding-y $padding-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-y + $border-width) $padding-base-x; padding: ($padding-y + $border-width) $padding-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; min-height: $input-height;
// Size it appropriately next to real form controls // Size it appropriately next to real form controls
padding-top: ($padding-base-y + $border-width); padding-top: ($padding-y + $border-width);
padding-bottom: ($padding-base-y + $border-width); padding-bottom: ($padding-y + $border-width);
// Remove default margin from `p` // Remove default margin from `p`
margin-bottom: 0; margin-bottom: 0;

2
scss/_input-group.scss
View File

@ -85,7 +85,7 @@
// //
.input-group-addon { .input-group-addon {
padding: $padding-base-y $padding-base-x; padding: $padding-y $padding-x;
font-size: $font-size-base; font-size: $font-size-base;
font-weight: normal; font-weight: normal;
line-height: 1; line-height: 1;

2
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-y $padding-base-x; padding: $padding-y $padding-x;
margin-left: -1px; margin-left: -1px;
line-height: $line-height-base; line-height: $line-height-base;
color: $pagination-color; color: $pagination-color;

28
scss/_variables.scss
View File

@ -96,29 +96,29 @@ $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-y: .5rem !default; $padding-y: .5rem !default;
$padding-base-x: .75rem !default; $padding-x: .75rem !default;
$padding-lg-y: .75rem !default; $padding-lg-y: .75rem !default;
$padding-lg-x: 1.5rem !default; $padding-lg-x: 1.5rem !default;
$padding-sm-y: .275rem !default; $padding-sm-y: .275rem !default;
$padding-sm-x: .75rem !default; $padding-sm-x: .75rem !default;
$padding-xs-y: .2rem !default; $padding-xs-y: .2rem !default;
$padding-xs-x: .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;
$border-radius: .25rem !default; $border-radius: .25rem !default;
$border-radius-lg: .3rem !default; $border-radius-lg: .3rem !default;
$border-radius-sm: .2rem !default; $border-radius-sm: .2rem !default;
$component-active-color: #fff !default; $component-active-color: #fff !default;
$component-active-bg: $brand-primary !default; $component-active-bg: $brand-primary !default;
$caret-width: .3em !default; $caret-width: .3em !default;
$caret-width-lg: $caret-width !default; $caret-width-lg: $caret-width !default;
@ -170,7 +170,7 @@ $btn-danger-border: darken($btn-danger-bg, 5%) !default;
$btn-link-disabled-color: $gray-light !default; $btn-link-disabled-color: $gray-light !default;
// Allows for customizing button radius independently from global border radius // Allows for customizing button radius independently from global border radius
$btn-border-radius: $border-radius; $btn-border-radius: $border-radius;
$btn-border-radius-lg: $border-radius-lg; $btn-border-radius-lg: $border-radius-lg;
$btn-border-radius-sm: $border-radius-sm; $btn-border-radius-sm: $border-radius-sm;
@ -192,7 +192,7 @@ $input-box-shadow-focus: rgba(102,175,233,.6) !default;
$input-color-placeholder: #999 !default; $input-color-placeholder: #999 !default;
$input-height: (($font-size-base * $line-height-base) + ($padding-base-y * 2) + ($border-width * 2)) !default; $input-height: (($font-size-base * $line-height-base) + ($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-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-height-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-y * 2) + ($border-width * 2)) !default;