diff options
| author | Mark Otto <[email protected]> | 2013-08-18 10:28:32 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2013-08-18 10:28:32 -0700 |
| commit | f8b65b41ab0c1bc130c3ca521fb99214f5509568 (patch) | |
| tree | 0b117fe251e09d6917c5e777c4735574da127617 /less | |
| parent | 6b24297c5beca5adc118d0524c50700928687c1c (diff) | |
| parent | 6496ffb7d4fc042983882af8dadce39b1d7affac (diff) | |
| download | bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.tar.xz bootstrap-f8b65b41ab0c1bc130c3ca521fb99214f5509568.zip | |
Merge branch '3.0.0-wip' into bs3_restore_glyphicons
Conflicts:
dist/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 5 | ||||
| -rw-r--r-- | less/theme.less | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index e4a78cd4e..45f2fd0a9 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -159,11 +159,12 @@ } // Carets in other button sizes .btn-lg .caret { - border-width: @caret-width-large; + border-width: @caret-width-large @caret-width-large 0; + border-bottom-width: 0; } // Upside down carets for .dropup .dropup .btn-lg .caret { - border-bottom-width: @caret-width-large; + border-width: 0 @caret-width-large @caret-width-large; } diff --git a/less/theme.less b/less/theme.less index 52e2d239a..f7e503644 100644 --- a/less/theme.less +++ b/less/theme.less @@ -94,7 +94,7 @@ // Basic navbar .navbar { #gradient > .vertical(@start-color: lighten(@navbar-bg, 10%); @end-color: @navbar-bg;); - border-radius: @border-radius-base; + border-radius: @navbar-border-radius; @shadow: inset 0 1px 0 rgba(255,255,255,.15), 0 1px 5px rgba(0,0,0,.075); .box-shadow(@shadow); |