rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-06 04:08:22 +01:00
Code Issues Actions Packages Releases Activity

add some vars

Browse Source
This commit is contained in:
Mark Otto 2016-12-26 15:42:19 -08:00 committed by Mark Otto
parent fe0573cdab
commit 4ba5bfb7cb
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scss/_forms.scss
View File

@ -192,7 +192,7 @@ select.form-control-lg {
.form-text { .form-text {
display: block; display: block;
margin-top: ($spacer * .25); margin-top: $form-text-margin-top;
} }
@ -203,12 +203,7 @@ select.form-control-lg {
.form-check { .form-check {
position: relative; position: relative;
display: block; display: block;
margin-bottom: ($spacer * .75); margin-bottom: $form-check-margin-bottom;
// Move up sibling radios or checkboxes for tighter spacing
+ .form-check {
margin-top: -.25rem;
}
&.disabled { &.disabled {
.form-check-label { .form-check-label {
@ -219,15 +214,15 @@ select.form-control-lg {
} }
.form-check-label { .form-check-label {
padding-left: 1.25rem; padding-left: $form-check-input-gutter;
margin-bottom: 0; // Override default `<label>` bottom margin margin-bottom: 0; // Override default `<label>` bottom margin
cursor: pointer; cursor: pointer;
} }
.form-check-input { .form-check-input {
position: absolute; position: absolute;
margin-top: .25rem; margin-top: $form-check-input-margin-y;
margin-left: -1.25rem; margin-left: -$form-check-input-gutter;
&:only-child { &:only-child {
position: static; position: static;
@ -243,7 +238,7 @@ select.form-control-lg {
} }
+ .form-check-inline { + .form-check-inline {
margin-left: .75rem; margin-left: $form-check-inline-margin-x;
} }
} }
@ -253,7 +248,7 @@ select.form-control-lg {
// Apply contextual and semantic states to individual form controls. // Apply contextual and semantic states to individual form controls.
.form-control-feedback { .form-control-feedback {
margin-top: ($spacer * .25); margin-top: $form-feedback-margin-top;
} }
.form-control-success, .form-control-success,

11
scss/_variables.scss
View File

@ -449,6 +449,16 @@ $input-height-sm: (($font-size-sm * $line-height-sm) + ($input-pa
$input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default; $input-transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s !default;
$form-text-margin-top: .25rem !default;
$form-feedback-margin-top: $form-text-margin-top !default;
$form-check-margin-bottom: .5rem !default;
$form-check-input-gutter: 1.25rem !default;
$form-check-input-margin-y: .25rem !default;
$form-check-input-margin-x: .25rem !default;
$form-check-inline-margin-x: .75rem !default;
$form-group-margin-bottom: $spacer-y !default; $form-group-margin-bottom: $spacer-y !default;
$input-group-addon-bg: $gray-lighter !default; $input-group-addon-bg: $gray-lighter !default;
@ -461,6 +471,7 @@ $custom-control-spacer-x: 1rem !default;
$custom-control-spacer-y: .25rem !default; $custom-control-spacer-y: .25rem !default;
$custom-control-indicator-size: 1rem !default; $custom-control-indicator-size: 1rem !default;
$custom-control-indicator-margin-y: (($line-height-base * 1rem) - $custom-control-indicator-size) / -2 !default;
$custom-control-indicator-bg: #ddd !default; $custom-control-indicator-bg: #ddd !default;
$custom-control-indicator-bg-size: 50% 50% !default; $custom-control-indicator-bg-size: 50% 50% !default;
$custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default; $custom-control-indicator-box-shadow: inset 0 .25rem .25rem rgba($black,.1) !default;