diff options
| author | Mark Otto <[email protected]> | 2015-06-22 23:24:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-22 23:24:32 -0700 |
| commit | ed42fc9b76bd89bae05790b37815bcacf4cde9f3 (patch) | |
| tree | 3ed963da617f697544690586026e7b79db15a00f | |
| parent | 03a5ff6b8289657c38d6c11e2b3fbdbaeda217a3 (diff) | |
| download | bootstrap-ed42fc9b76bd89bae05790b37815bcacf4cde9f3.tar.xz bootstrap-ed42fc9b76bd89bae05790b37815bcacf4cde9f3.zip | |
line-height-base to line-height var
| -rw-r--r-- | scss/_badge.scss | 2 | ||||
| -rw-r--r-- | scss/_buttons.scss | 2 | ||||
| -rw-r--r-- | scss/_code.scss | 2 | ||||
| -rw-r--r-- | scss/_dropdown.scss | 4 | ||||
| -rw-r--r-- | scss/_forms.scss | 2 | ||||
| -rw-r--r-- | scss/_images.scss | 2 | ||||
| -rw-r--r-- | scss/_pagination.scss | 2 | ||||
| -rw-r--r-- | scss/_reboot.scss | 4 | ||||
| -rw-r--r-- | scss/_tables.scss | 2 | ||||
| -rw-r--r-- | scss/_type.scss | 2 | ||||
| -rw-r--r-- | scss/_variables.scss | 4 | ||||
| -rw-r--r-- | scss/mixins/_reset-text.scss | 2 |
12 files changed, 15 insertions, 15 deletions
diff --git a/scss/_badge.scss b/scss/_badge.scss index e842cea30..ca2ca1115 100644 --- a/scss/_badge.scss +++ b/scss/_badge.scss @@ -11,7 +11,7 @@ padding-left: .6em; font-size: .75em; font-weight: $badge-font-weight; - line-height: $line-height-base; + line-height: $line-height; color: $badge-color; text-align: center; white-space: nowrap; diff --git a/scss/_buttons.scss b/scss/_buttons.scss index e743fab12..12805dd2e 100644 --- a/scss/_buttons.scss +++ b/scss/_buttons.scss @@ -17,7 +17,7 @@ cursor: pointer; user-select: none; border: $border-width solid transparent; - @include button-size($padding-y, $padding-x, $font-size-base, $line-height-base, $btn-border-radius); + @include button-size($padding-y, $padding-x, $font-size-base, $line-height, $btn-border-radius); transition: all .2s ease-in-out; &, diff --git a/scss/_code.scss b/scss/_code.scss index 69936c57e..e1c5413be 100644 --- a/scss/_code.scss +++ b/scss/_code.scss @@ -43,7 +43,7 @@ pre { margin-top: 0; margin-bottom: 1rem; font-size: 90%; - line-height: $line-height-base; + line-height: $line-height; color: $pre-color; // Account for some code outputs that place code tags in pre tags diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index b66c94899..88f599ea9 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -60,7 +60,7 @@ padding: 3px 20px; clear: both; font-weight: normal; - line-height: $line-height-base; + line-height: $line-height; color: $dropdown-link-color; white-space: nowrap; // prevent links from randomly breaking onto new lines } @@ -141,7 +141,7 @@ display: block; padding: 3px 20px; font-size: $font-size-sm; - line-height: $line-height-base; + line-height: $line-height; color: $dropdown-header-color; white-space: nowrap; // as with > li > a } diff --git a/scss/_forms.scss b/scss/_forms.scss index 9fb2d5692..6a02a1999 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -14,7 +14,7 @@ // height: $input-height; padding: $padding-y $padding-x; font-size: $font-size-base; - line-height: $line-height-base; + line-height: $line-height; color: $input-color; background-color: $input-bg; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214. diff --git a/scss/_images.scss b/scss/_images.scss index a2e82663f..dbdd858b8 100644 --- a/scss/_images.scss +++ b/scss/_images.scss @@ -11,7 +11,7 @@ // Image thumbnails .img-thumbnail { padding: $thumbnail-padding; - line-height: $line-height-base; + line-height: $line-height; background-color: $thumbnail-bg; border: 1px solid $thumbnail-border; border-radius: $thumbnail-border-radius; diff --git a/scss/_pagination.scss b/scss/_pagination.scss index 11b306e61..232bf27fa 100644 --- a/scss/_pagination.scss +++ b/scss/_pagination.scss @@ -19,7 +19,7 @@ float: left; // Collapse white-space padding: $padding-y $padding-x; margin-left: -1px; - line-height: $line-height-base; + line-height: $line-height; color: $pagination-color; text-decoration: none; background-color: $pagination-bg; diff --git a/scss/_reboot.scss b/scss/_reboot.scss index 495470cfa..fe76f8ddf 100644 --- a/scss/_reboot.scss +++ b/scss/_reboot.scss @@ -68,7 +68,7 @@ body { // Make the `body` use the `font-size-root` font-family: $font-family-base; font-size: $font-size-base; - line-height: $line-height-base; + line-height: $line-height; // Go easy on the eyes and use something other than `#000` for text color: $text-color; // By default, `<body>` has no `background-color` so we set one as a best practice. @@ -290,6 +290,6 @@ input[type="search"] { output { display: inline-block; // font-size: $font-size-base; -// line-height: $line-height-base; +// line-height: $line-height; // color: $input-color; } diff --git a/scss/_tables.scss b/scss/_tables.scss index ef399c0fa..658248fc4 100644 --- a/scss/_tables.scss +++ b/scss/_tables.scss @@ -15,7 +15,7 @@ th, td { padding: $table-cell-padding; - line-height: $line-height-base; + line-height: $line-height; vertical-align: top; border-top: 1px solid $table-border-color; } diff --git a/scss/_type.scss b/scss/_type.scss index 8f353df70..b3d2efedd 100644 --- a/scss/_type.scss +++ b/scss/_type.scss @@ -144,7 +144,7 @@ mark, footer { display: block; font-size: 80%; // back to default font-size - line-height: $line-height-base; + line-height: $line-height; color: $blockquote-small-color; &:before { diff --git a/scss/_variables.scss b/scss/_variables.scss index a862fda73..e6ec586b6 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -189,7 +189,7 @@ $input-box-shadow-focus: rgba(102,175,233,.6) !default; $input-color-placeholder: #999 !default; -$input-height: (($font-size-base * $line-height-base) + ($padding-y * 2) + ($border-width * 2)) !default; +$input-height: (($font-size-base * $line-height) + ($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-sm: (($font-size-sm * $line-height-sm) + ($padding-sm-y * 2) + ($border-width * 2)) !default; @@ -466,7 +466,7 @@ $label-link-hover-color: #fff !default; $modal-inner-padding: 15px !default; $modal-title-padding: 15px !default; -$modal-title-line-height: $line-height-base !default; +$modal-title-line-height: $line-height !default; $modal-content-bg: #fff !default; $modal-content-border-color: rgba(0,0,0,.2) !default; diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss index c78db0314..014dff566 100644 --- a/scss/mixins/_reset-text.scss +++ b/scss/mixins/_reset-text.scss @@ -5,7 +5,7 @@ font-weight: normal; letter-spacing: normal; line-break: auto; - line-height: $line-height-base; + line-height: $line-height; text-align: left; // Fallback for where `start` is not supported text-align: start; text-decoration: none; |