diff options
| author | Mark Otto <[email protected]> | 2012-03-05 20:49:39 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-05 20:49:39 -0800 |
| commit | ac6eff280df58a96bfd429189d2dd2d6e5c38208 (patch) | |
| tree | 005d5538939c21c53bb911f7108b444c6b79be10 /less | |
| parent | 9c2b2c589da892bb15f276acc7d8f8707d4fc205 (diff) | |
| parent | efd5e29ff46444e11cc1decc77fa53ed22a6b496 (diff) | |
| download | bootstrap-ac6eff280df58a96bfd429189d2dd2d6e5c38208.tar.xz bootstrap-ac6eff280df58a96bfd429189d2dd2d6e5c38208.zip | |
Merge branch 'charettes-small-button-dropdowns-caret' into 2.0.2-wip
Conflicts:
less/dropdowns.less
Diffstat (limited to 'less')
| -rw-r--r-- | less/button-groups.less | 5 | ||||
| -rw-r--r-- | less/dropdowns.less | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/less/button-groups.less b/less/button-groups.less index ad93e3dd2..a70d0153d 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -143,8 +143,3 @@ } } -// Small button dropdowns -.btn-small .caret { - margin-top: 4px; -} - diff --git a/less/dropdowns.less b/less/dropdowns.less index 1e58ebf79..e98dc4557 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -32,6 +32,7 @@ content: "\2193"; } +// Place the caret .dropdown .caret { margin-top: 8px; margin-left: 2px; @@ -41,6 +42,11 @@ .opacity(100); } +// Small button dropdowns +.btn-small .caret { + margin-top: 6px; +} + // The dropdown menu (ul) // ---------------------- .dropdown-menu { |