diff options
| author | fat <[email protected]> | 2013-08-17 13:43:58 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2013-08-17 13:43:58 -0700 |
| commit | 728a5e17d667422cdad791e06375e8e9a0f80cc1 (patch) | |
| tree | fa1a70b54684f362584ecbc23be4b82487379261 /less | |
| parent | 53c80ed9cbeff8a3c58abe0f824ff68ef56d617a (diff) | |
| parent | 0c70744ea22126b6224bde75b4ccb6068941e38f (diff) | |
| download | bootstrap-728a5e17d667422cdad791e06375e8e9a0f80cc1.tar.xz bootstrap-728a5e17d667422cdad791e06375e8e9a0f80cc1.zip | |
Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/dropdowns.less | 7 | ||||
| -rw-r--r-- | less/panels.less | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/less/dropdowns.less b/less/dropdowns.less index d9417358b..53aab0267 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -13,6 +13,9 @@ border-top: @caret-width-base solid @dropdown-caret-color; 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; content: ""; } @@ -161,7 +164,9 @@ .navbar-fixed-bottom .dropdown { // Reverse the caret .caret { - border-top: 0; + // Firefox fix for https://github.com/twbs/bootstrap/issues/9538. Once this + // gets fixed, restore `border-top: 0;`. + border-top: 0 dotted; border-bottom: 4px solid @dropdown-caret-color; content: ""; } diff --git a/less/panels.less b/less/panels.less index 6d22dd965..5cd04b3db 100644 --- a/less/panels.less +++ b/less/panels.less @@ -59,7 +59,7 @@ .panel-title { margin-top: 0; margin-bottom: 0; - font-size: (@font-size-base * 1.25); + font-size: ceil((@font-size-base * 1.125)); > a { color: inherit; } |