diff options
| author | Mark Otto <[email protected]> | 2013-11-28 15:55:17 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-11-28 15:55:17 -0800 |
| commit | b5f9cc20578fb57b2b69e10cf32bba55f9c940e4 (patch) | |
| tree | 72b6c245b35c2c6783bc43d4add6ce0e1e65b801 /less/dropdowns.less | |
| parent | 0da3901ed5a6d498af8b7c76b61d004a003f716b (diff) | |
| parent | 0be94180b99cec9be239124c666721e40fbfbc97 (diff) | |
| download | bootstrap-b5f9cc20578fb57b2b69e10cf32bba55f9c940e4.tar.xz bootstrap-b5f9cc20578fb57b2b69e10cf32bba55f9c940e4.zip | |
Merge branch 'master' into pr/11414
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less/dropdowns.less')
| -rw-r--r-- | less/dropdowns.less | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index 5d7e0fb4e..1a8f1973f 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -10,12 +10,9 @@ height: 0; margin-left: 2px; vertical-align: middle; - border-top: @caret-width-base solid @dropdown-caret-color; + border-top: @caret-width-base solid; border-right: @caret-width-base solid transparent; border-left: @caret-width-base solid transparent; - // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once fixed, - // we can just straight up remove this. - border-bottom: 0 dotted; } // The dropdown wrapper (div) @@ -163,10 +160,8 @@ .navbar-fixed-bottom .dropdown { // Reverse the caret .caret { - // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this - // gets fixed, restore `border-top: 0;`. - border-top: 0 dotted; - border-bottom: @caret-width-base solid @dropdown-caret-color; + border-top: 0; + border-bottom: @caret-width-base solid; content: ""; } // Different positioning for bottom up menu |