diff options
| author | Mark Otto <[email protected]> | 2015-06-22 19:02:30 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-22 19:02:30 -0700 |
| commit | acca337ced9278c9d5e85c13c94178211fe9c1f2 (patch) | |
| tree | f3fd7d453cf7f8913279fa407edb385184bd7a4b | |
| parent | 75cf69a1ab9bf36147ab237c937b46751b981200 (diff) | |
| download | bootstrap-acca337ced9278c9d5e85c13c94178211fe9c1f2.tar.xz bootstrap-acca337ced9278c9d5e85c13c94178211fe9c1f2.zip | |
Remove var
| -rw-r--r-- | scss/_forms.scss | 3 | ||||
| -rw-r--r-- | scss/_variables.scss | 5 |
2 files changed, 3 insertions, 5 deletions
diff --git a/scss/_forms.scss b/scss/_forms.scss index 1632c3898..9fb2d5692 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -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 { diff --git a/scss/_variables.scss b/scss/_variables.scss index 930bed7ba..601dbd3c6 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -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; |