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 /docs/assets | |
| 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 'docs/assets')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 54891 -> 54898 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 914e79630..ea89c1647 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 6c38ef11f..3e0cbf11b 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1675,6 +1675,9 @@ table .span24 { opacity: 1; filter: alpha(opacity=100); } +.btn-small .caret { + margin-top: 6px; +} .dropdown-menu { position: absolute; top: 100%; @@ -2232,9 +2235,6 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { opacity: 0.75; filter: alpha(opacity=75); } -.btn-small .caret { - margin-top: 4px; -} .alert { padding: 8px 35px 8px 14px; margin-bottom: 18px; |