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

Remove var

Browse Source
This commit is contained in:
Mark Otto 2015-06-22 19:02:30 -07:00
parent 75cf69a1ab
commit acca337ced
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scss/_forms.scss
View File

@ -317,7 +317,8 @@ input[type="checkbox"] {
.has-feedback label {
~ .form-control-feedback {
top: ($line-height-computed + 5); // Height of the `label` and its margin
// TODO: redo this since we nuked the `$line-height-computed`
top: 0; // Height of the `label` and its margin
}
&.sr-only ~ .form-control-feedback {

5
scss/_variables.scss
View File

@ -83,9 +83,6 @@ $font-size-h6: 1rem !default;
$line-height: 1.5 !default;
// TODO: nuke this
$line-height-computed: 1 !default;
$headings-font-family: inherit !default;
$headings-font-weight: 500 !default;
$headings-line-height: 1.1 !default;
@ -286,7 +283,7 @@ $container-max-widths: (
// Basics of a navbar
// $navbar-height: 50px !default;
$navbar-margin-bottom: $line-height-computed !default;
$navbar-margin-bottom: $spacer-y !default;
$navbar-border-radius: $border-radius !default;
$navbar-padding-horizontal: $spacer !default;
$navbar-padding-vertical: ($spacer / 2) !default;