diff options
author | Martijn Cuppens <martijn.cuppens@intracto.com> | 2019-01-07 18:11:26 +0300 |
---|---|---|
committer | Mark Otto <otto@github.com> | 2019-01-14 03:27:40 +0300 |
commit | e57cdee6bc449eaed4dfc2bbf9732d1d6b489864 (patch) | |
tree | 9a4fd425ceccad4540ec49ef1e8657302bff7f27 /scss | |
parent | fd98e77cacc57ff1f463fad4d34fee2deeb847f1 (diff) |
Sync dropdown font size with btn font size
Diffstat (limited to 'scss')
-rw-r--r-- | scss/_dropdown.scss | 2 | ||||
-rw-r--r-- | scss/_variables.scss | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/scss/_dropdown.scss b/scss/_dropdown.scss index 0d8303bbce..acc68aa599 100644 --- a/scss/_dropdown.scss +++ b/scss/_dropdown.scss @@ -24,7 +24,7 @@ min-width: $dropdown-min-width; padding: $dropdown-padding-y 0; margin: $dropdown-spacer 0 0; // override default ul - font-size: $font-size-base; // Redeclare because nesting can cause inheritance issues + font-size: $dropdown-font-size; 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/_variables.scss b/scss/_variables.scss index a6ad6a0535..63f33a5374 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -755,6 +755,7 @@ $navbar-dark-brand-hover-color: $navbar-dark-active-color !default; $dropdown-min-width: 10rem !default; $dropdown-padding-y: .5rem !default; $dropdown-spacer: .125rem !default; +$dropdown-font-size: $btn-font-size !default; $dropdown-bg: $white !default; $dropdown-border-color: rgba($black, .15) !default; $dropdown-border-radius: $border-radius !default; |