line-height-base to line-height var

diff --git a/scss/_badge.scss b/scss/_badge.scss
index e842cea304666ad7368f77f45fe3ec67ffcd1d33..ca2ca111575d60b5b4c13d247c127962a5bf8b6c 100644 (file)
--- 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 e743fab1212e80a45c186f97121443ee2f0f022b..12805dd2e3ab288046169db33d23f42088b7354d 100644 (file)
--- 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 69936c57e31bd020e3f2dc63f0ee6c9862952d79..e1c5413be671e943986a3790e1ebf70bc0fccc72 100644 (file)
--- 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 b66c9489982c7721e376626bd8b2945efe1fe9d5..88f599ea948d1dddd3bd6c9fc9123c830a225c41 100644 (file)
--- 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 9fb2d569259b36451ebd800f756fcae56719eae8..6a02a1999f530fa730c396983ab7bd307e8b99de 100644 (file)
--- 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 a2e82663fb554a934652a19d5db2081aff4bb474..dbdd858b8fbef3f7845e10e39fec39e4e23b688d 100644 (file)
--- 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 11b306e619e29586209ac7bf97e0f9985a2c2af8..232bf27fa61361fb71459fab43d47f862bb795a4 100644 (file)
--- 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 495470cfa231119798d1995b5ef5bf5e1b1642a2..fe76f8ddf7eede6e49da8844370cfdc007efedbb 100644 (file)
--- 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 ef399c0fad2446e3aeafe664d89c90a26435af0a..658248fc4381d7780f1e2b9bc48787f4025583c3 100644 (file)
--- 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 8f353df70270696782dcc07d5fbf28458ea7b124..b3d2efedd9007a5ccffdf55f14c8423820911634 100644 (file)
--- 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 a862fda73b38a668c6b37b96b6efa6d5e93500c1..e6ec586b6c9e1c2d61449f599f7b454f6227cce1 100644 (file)
--- 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 c78db03144caaa1e72ee70a0cfd6e201eb0a061b..014dff566567a080a7e98c24d3a098ee651528f0 100644 (file)
--- 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;