clarify usage of base font-size so we know what's up

diff --git a/scss/_close.scss b/scss/_close.scss
index 5a92430a47c767301966e8b0ce59afa3789c87bb..859990e3105abe1506516e1c7cdfeb44422711c8 100644 (file)
--- a/scss/_close.scss
+++ b/scss/_close.scss
@@ -1,6 +1,6 @@
 .close {
   float: right;
-  font-size: ($font-size-base * 1.5);
+  font-size: $close-font-size;
   font-weight: $close-font-weight;
   line-height: 1;
   color: $close-color;

diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss
index 1c9c4f2352744d09ae7279be991ba7e0b3982cde..1c2741a2e36a2d3bdba7dfed81d0d4e01e814422 100644 (file)
--- a/scss/_dropdown.scss
+++ b/scss/_dropdown.scss
@@ -44,7 +44,7 @@
   min-width: $dropdown-min-width;
   padding: $dropdown-padding-y 0;
   margin: $dropdown-margin-top 0 0; // override default ul
-  font-size: $font-size-base;
+  font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues
   color: $body-color;
   text-align: left; // Ensures proper alignment if parent has it changed (e.g., modal footer)
   list-style: none;

diff --git a/scss/_input-group.scss b/scss/_input-group.scss
index 29831ab96db4d6de06fa51d1fb291ce8e5c3b0f8..ab44883bd1960ff63a5dcd58226f6ddc33c618c0 100644 (file)
--- a/scss/_input-group.scss
+++ b/scss/_input-group.scss
@@ -69,7 +69,7 @@
 .input-group-addon {
   padding: $input-padding-y $input-padding-x;
   margin-bottom: 0; // Allow use of <label> elements by overriding our default margin-bottom
-  font-size: $font-size-base;
+  font-size: $font-size-base; // Match inputs
   font-weight: $font-weight-normal;
   line-height: $input-line-height;
   color: $input-color;

diff --git a/scss/_popover.scss b/scss/_popover.scss
index 730f7b5d3dee1ce8e8fe4f8e0c0259e56e029a40..1b6363405ce939ff4b07e672542a0b15a82c3d28 100644 (file)
--- a/scss/_popover.scss
+++ b/scss/_popover.scss
@@ -130,7 +130,7 @@
 // Offset the popover to account for the popover arrow
 .popover-title {
   padding: $popover-title-padding-y $popover-title-padding-x;
-  margin: 0; // reset heading margin
+  margin-bottom: 0; // Reset the default from Reboot
   font-size: $font-size-base;
   background-color: $popover-title-bg;
   border-bottom: $popover-border-width solid darken($popover-title-bg, 5%);

diff --git a/scss/_variables.scss b/scss/_variables.scss
index e16a548d53b74a07105eb431521e34c5420c864e..36dc429c8aa240fb92ed0693b3e3d77ffd0d3ef6 100644 (file)
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -938,6 +938,7 @@ $carousel-transition:           transform .6s ease-in-out !default;
 
 // Close
 
+$close-font-size:             $font-size-base * 1.5 !default;
 $close-font-weight:           $font-weight-bold !default;
 $close-color:                 $black !default;
 $close-text-shadow:           0 1px 0 $white !default;