aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-03-10 13:40:58 -0800
committerMark Otto <[email protected]>2012-03-10 13:40:58 -0800
commitdd5cffc308f9c990ed40be074c864d0ed563ef12 (patch)
tree1c6eb4a16d7408efc4f0ddf9c75128629df8a43b /docs
parentc7eb1ab49a585b58f2ef8ec8450a704cb5e0172c (diff)
downloadbootstrap-dd5cffc308f9c990ed40be074c864d0ed563ef12.tar.xz
bootstrap-dd5cffc308f9c990ed40be074c864d0ed563ef12.zip
add button sizes to docs for button dropdowns, clean up styles for them
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/bootstrap.zipbin55121 -> 55175 bytes
-rw-r--r--docs/assets/css/bootstrap.css23
-rw-r--r--docs/components.html44
-rw-r--r--docs/templates/pages/components.mustache44
4 files changed, 108 insertions, 3 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip
index 70186cf1b..ca6b71417 100644
--- a/docs/assets/bootstrap.zip
+++ b/docs/assets/bootstrap.zip
Binary files differ
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 05b86bc3d..15d7c0d07 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 809f4d40e..767a8474d 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -289,6 +289,50 @@
</pre>
</div>
</div>
+ <div class="row">
+ <div class="span4">
+ <h3>Works with all button sizes</h3>
+ <p>Button dropdowns work at any size. your button sizes to <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code>.</p>
+ <div class="btn-toolbar" style="margin-top: 18px;">
+ <div class="btn-group">
+ <button class="btn btn-large dropdown-toggle" data-toggle="dropdown">Large button <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">Small button <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">Mini button <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">Action</a></li>
+ <li><a href="#">Another action</a></li>
+ <li><a href="#">Something else here</a></li>
+ <li class="divider"></li>
+ <li><a href="#">Separated link</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ </div><!-- /btn-toolbar -->
+ </div><!--/span-->
+ <div class="span4">
+
+ </div><!--/span-->
+ <div class="span4">
+
+ </div><!--/span-->
+ </div><!--/row-->
<div class="alert alert-info">
<strong>Heads up!</strong> In some cases&mdash;like mobile&mdash;dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.
</div>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 354c4d54d..b52919995 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -213,6 +213,50 @@
</pre>
</div>
</div>
+ <div class="row">
+ <div class="span4">
+ <h3>{{_i}}Works with all button sizes{{/i}}</h3>
+ <p>Button dropdowns work at any size. your button sizes to <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code>.</p>
+ <div class="btn-toolbar" style="margin-top: 18px;">
+ <div class="btn-group">
+ <button class="btn btn-large dropdown-toggle" data-toggle="dropdown">{{_i}}Large button{{/i}} <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">{{_i}}Small button{{/i}} <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ <div class="btn-group">
+ <button class="btn btn-mini dropdown-toggle" data-toggle="dropdown">{{_i}}Mini button{{/i}} <span class="caret"></span></button>
+ <ul class="dropdown-menu">
+ <li><a href="#">{{_i}}Action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Another action{{/i}}</a></li>
+ <li><a href="#">{{_i}}Something else here{{/i}}</a></li>
+ <li class="divider"></li>
+ <li><a href="#">{{_i}}Separated link{{/i}}</a></li>
+ </ul>
+ </div><!-- /btn-group -->
+ </div><!-- /btn-toolbar -->
+ </div><!--/span-->
+ <div class="span4">
+
+ </div><!--/span-->
+ <div class="span4">
+
+ </div><!--/span-->
+ </div><!--/row-->
<div class="alert alert-info">
<strong>{{_i}}Heads up!{{/i}}</strong> {{_i}}In some cases&mdash;like mobile&mdash;dropdown menus will extend outside the viewport. You need to resolve the alignment manually or with custom javascript.{{/i}}
</div>