From ba37c37615429c5e562d1e9f88a11e263640963c Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 3 Feb 2016 19:45:13 -0800
Subject: [PATCH] Redo line-height globally

- Rename -height to -height-base to match other vars
- Drop use of -height across the board and rely on it to be inherited
- Adjust padding of .dropdown-header to account for different line-height of h6 heading element (this needs refactoring for variables and rems also)
---
 docs/assets/scss/_content.scss |  1 -
 scss/_buttons.scss             |  2 +-
 scss/_code.scss                |  1 -
 scss/_dropdown.scss            |  4 +---
 scss/_forms.scss               |  1 -
 scss/_images.scss              |  1 -
 scss/_pagination.scss          |  1 -
 scss/_reboot.scss              |  2 +-
 scss/_tables.scss              |  1 -
 scss/_type.scss                |  1 -
 scss/_variables.scss           | 10 +++++-----
 scss/mixins/_buttons.scss      |  1 -
 scss/mixins/_pagination.scss   |  1 -
 scss/mixins/_reset-text.scss   |  2 +-
 14 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/docs/assets/scss/_content.scss b/docs/assets/scss/_content.scss
index 70ca83375c..4e753dd04f 100644
--- a/docs/assets/scss/_content.scss
+++ b/docs/assets/scss/_content.scss
@@ -20,7 +20,6 @@
         > th,
         > td {
           padding: $table-cell-padding;
-          line-height: $line-height;
           vertical-align: top;
           border: 1px solid $table-border-color;
 
diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 640fe1dfeb..1373218eb0 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -11,7 +11,7 @@
   cursor: pointer;
   user-select: none;
   border: $input-btn-border-width solid transparent;
-  @include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $line-height, $btn-border-radius);
+  @include button-size($btn-padding-y, $btn-padding-x, $font-size-base, $line-height-base, $btn-border-radius);
   @include transition(all .2s ease-in-out);
 
   &,
diff --git a/scss/_code.scss b/scss/_code.scss
index a9ddb4c0f5..e323516982 100644
--- a/scss/_code.scss
+++ b/scss/_code.scss
@@ -38,7 +38,6 @@ pre {
   margin-top: 0;
   margin-bottom: 1rem;
   font-size: 90%;
-  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 cf4472acd0..48bdee2869 100644
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -70,7 +70,6 @@
   padding: 3px 20px;
   clear: both;
   font-weight: normal;
-  line-height: $line-height;
   color: $dropdown-link-color;
   text-align: inherit; // For `<button>`s
   white-space: nowrap; // prevent links from randomly breaking onto new lines
@@ -147,9 +146,8 @@
 // Dropdown section headers
 .dropdown-header {
   display: block;
-  padding: 3px 20px;
+  padding: 5px 20px;
   font-size: $font-size-sm;
-  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 aa87bd51a3..28e0f26bdc 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -9,7 +9,6 @@
   // height: $input-height;
   padding: $input-padding-y $input-padding-x;
   font-size: $font-size-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 60e8fc9b57..410a09e364 100644
--- a/scss/_images.scss
+++ b/scss/_images.scss
@@ -17,7 +17,6 @@
 // Image thumbnails
 .img-thumbnail {
   padding: $thumbnail-padding;
-  line-height: $line-height;
   background-color: $thumbnail-bg;
   border: $thumbnail-border-width solid $thumbnail-border-color;
   border-radius: $thumbnail-border-radius;
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index c0b82399fb..5f40a7fd4c 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -47,7 +47,6 @@
   float: left; // Collapse white-space
   padding: $pagination-padding-y $pagination-padding-x;
   margin-left: -1px;
-  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 1920474a96..ac3e83baa4 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -77,7 +77,7 @@ body {
   // Make the `body` use the `font-size-root`
   font-family: $font-family-base;
   font-size: $font-size-base;
-  line-height: $line-height;
+  line-height: $line-height-base;
   // Go easy on the eyes and use something other than `#000` for text
   color: $body-color;
   // By default, `<body>` has no `background-color` so we set one as a best practice.
diff --git a/scss/_tables.scss b/scss/_tables.scss
index 8ec35b9d40..bf688a2c7e 100644
--- a/scss/_tables.scss
+++ b/scss/_tables.scss
@@ -10,7 +10,6 @@
   th,
   td {
     padding: $table-cell-padding;
-    line-height: $line-height;
     vertical-align: top;
     border-top: $table-border-width solid $table-border-color;
   }
diff --git a/scss/_type.scss b/scss/_type.scss
index fc45d352db..57214e8187 100644
--- a/scss/_type.scss
+++ b/scss/_type.scss
@@ -123,7 +123,6 @@ mark,
 .blockquote-footer {
   display: block;
   font-size: 80%; // back to default font-size
-  line-height: $line-height;
   color: $blockquote-small-color;
 
   &::before {
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 81eabb278d..a9159e5430 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -140,7 +140,7 @@ $grid-gutter-width: 1.875rem !default; // 30px
 $font-family-sans-serif: "Helvetica Neue", Helvetica, Arial, sans-serif !default;
 $font-family-serif:      Georgia, "Times New Roman", Times, serif !default;
 $font-family-monospace:  Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default;
-$font-family-base:       $font-family-sans-serif !default;
+$font-family-base: $font-family-sans-serif !default;
 
 // Pixel value used to responsively scale all typography. Applied to the `<html>` element.
 $font-size-root: 16px !default;
@@ -150,6 +150,8 @@ $font-size-lg:   1.25rem !default;
 $font-size-sm:   .875rem !default;
 $font-size-xs:   .75rem !default;
 
+$line-height-base: 1.5 !default;
+
 $font-size-h1: 2.5rem !default;
 $font-size-h2: 2rem !default;
 $font-size-h3: 1.75rem !default;
@@ -167,8 +169,6 @@ $display2-weight: 300 !default;
 $display3-weight: 300 !default;
 $display4-weight: 300 !default;
 
-$line-height: 1.5 !default;
-
 $headings-margin-bottom: ($spacer / 2) !default;
 $headings-font-family:   inherit !default;
 $headings-font-weight:   500 !default;
@@ -314,7 +314,7 @@ $input-padding-y-sm:             .275rem !default;
 $input-padding-x-lg:             1.25rem !default;
 $input-padding-y-lg:             .75rem !default;
 
-$input-height:                   (($font-size-base * $line-height) + ($input-padding-y * 2)) !default;
+$input-height:                   (($font-size-base * $line-height-base) + ($input-padding-y * 2)) !default;
 $input-height-lg:                (($font-size-lg * $line-height-lg) + ($input-padding-y-lg * 2)) !default;
 $input-height-sm:                (($font-size-sm * $line-height-sm) + ($input-padding-y-sm * 2)) !default;
 
@@ -604,7 +604,7 @@ $label-font-weight:           bold !default;
 $modal-inner-padding:         15px !default;
 
 $modal-title-padding:         15px !default;
-$modal-title-line-height:     $line-height !default;
+$modal-title-line-height:     $line-height-base !default;
 
 $modal-content-bg:               #fff !default;
 $modal-content-border-color:     rgba(0,0,0,.2) !default;
diff --git a/scss/mixins/_buttons.scss b/scss/mixins/_buttons.scss
index 21240dd932..968634880e 100644
--- a/scss/mixins/_buttons.scss
+++ b/scss/mixins/_buttons.scss
@@ -95,6 +95,5 @@
 @mixin button-size($padding-y, $padding-x, $font-size, $line-height, $border-radius) {
   padding: $padding-y $padding-x;
   font-size: $font-size;
-  line-height: $line-height;
   @include border-radius($border-radius);
 }
diff --git a/scss/mixins/_pagination.scss b/scss/mixins/_pagination.scss
index ff36eb6b40..8cd9317cf5 100644
--- a/scss/mixins/_pagination.scss
+++ b/scss/mixins/_pagination.scss
@@ -4,7 +4,6 @@
   .page-link {
     padding: $padding-y $padding-x;
     font-size: $font-size;
-    line-height: $line-height;
   }
 
   .page-item {
diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss
index e1d1725fad..bb882f2ac0 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;
+  line-height: $line-height-base;
   text-align: left; // Fallback for where `start` is not supported
   text-align: start;
   text-decoration: none;