diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip index 70186cf1ba..ca6b71417a 100644 Binary files a/docs/assets/bootstrap.zip and b/docs/assets/bootstrap.zip differ diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 05b86bc3d1..15d7c0d070 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1677,9 +1677,6 @@ table .span24 { opacity: 1; filter: alpha(opacity=100); } -.btn-small .caret { - margin-top: 6px; -} .dropdown-menu { position: absolute; top: 100%; @@ -2214,6 +2211,14 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { *padding-top: 5px; *padding-bottom: 5px; } +.btn-group .btn-mini.dropdown-toggle { + padding-left: 5px; + padding-right: 5px; +} +.btn-group .btn-large.dropdown-toggle { + padding-left: 12px; + padding-right: 12px; +} .btn-group.open { *z-index: 1000; } @@ -2238,6 +2243,18 @@ button.btn.btn-small, input[type="submit"].btn.btn-small { opacity: 1; filter: alpha(opacity=100); } +.btn-mini .caret { + margin-top: 5px; +} +.btn-small .caret { + margin-top: 6px; +} +.btn-large .caret { + margin-top: 6px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid #000000; +} .btn-primary .caret, .btn-warning .caret, .btn-danger .caret, diff --git a/docs/components.html b/docs/components.html index 809f4d40e9..767a8474d3 100644 --- a/docs/components.html +++ b/docs/components.html @@ -289,6 +289,50 @@ +
+
+

Works with all button sizes

+

Button dropdowns work at any size. your button sizes to .btn-large, .btn-small, or .btn-mini.

+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+
+ +
+
Heads up! In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 354c4d54df..b52919995e 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -213,6 +213,50 @@ +
+
+

{{_i}}Works with all button sizes{{/i}}

+

Button dropdowns work at any size. your button sizes to .btn-large, .btn-small, or .btn-mini.

+
+
+ + +
+
+ + +
+
+ + +
+
+
+
+ +
+
+ +
+
{{_i}}Heads up!{{/i}} {{_i}}In some cases—like mobile—dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}}
diff --git a/less/button-groups.less b/less/button-groups.less index a70d0153dc..e7ba6a065e 100644 --- a/less/button-groups.less +++ b/less/button-groups.less @@ -98,6 +98,14 @@ *padding-top: 5px; *padding-bottom: 5px; } +.btn-group .btn-mini.dropdown-toggle { + padding-left: 5px; + padding-right: 5px; +} +.btn-group .btn-large.dropdown-toggle { + padding-left: 12px; + padding-right: 12px; +} .btn-group.open { // IE7's z-index only goes to the nearest positioned ancestor, which would @@ -127,6 +135,19 @@ .open.btn-group .caret { .opacity(100); } +// Carets in other button sizes +.btn-mini .caret { + margin-top: 5px; +} +.btn-small .caret { + margin-top: 6px; +} +.btn-large .caret { + margin-top: 6px; + border-left: 5px solid transparent; + border-right: 5px solid transparent; + border-top: 5px solid @black; +} // Account for other colors diff --git a/less/dropdowns.less b/less/dropdowns.less index e98dc45573..3e74b68ff0 100644 --- a/less/dropdowns.less +++ b/less/dropdowns.less @@ -42,11 +42,6 @@ .opacity(100); } -// Small button dropdowns -.btn-small .caret { - margin-top: 6px; -} - // The dropdown menu (ul) // ---------------------- .dropdown-menu {