From e57cdee6bc449eaed4dfc2bbf9732d1d6b489864 Mon Sep 17 00:00:00 2001
From: Martijn Cuppens <martijn.cuppens@intracto.com>
Date: Mon, 7 Jan 2019 16:11:26 +0100
Subject: [PATCH] Sync dropdown font size with btn font size

---
 scss/_dropdown.scss  | 2 +-
 scss/_variables.scss | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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;
-- 
GitLab