diff options
| author | Mark Otto <markotto@twitter.com> | 2012-02-17 09:28:16 +0400 |
|---|---|---|
| committer | Mark Otto <markotto@twitter.com> | 2012-02-17 09:28:16 +0400 |
| commit | 268e7d67abb32ed5cfc575c71f03d635672e781c (patch) | |
| tree | 7d32b7d1b73dfe529e4f61368355bb357156c488 /docs | |
| parent | 61e2201c64a9a61792680c2b1d236b0a753ed182 (diff) | |
add mini buttons per #1971
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 53198 -> 53227 bytes | |||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 5 | ||||
| -rw-r--r-- | docs/base-css.html | 6 | ||||
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 6 |
4 files changed, 15 insertions, 2 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 71552e7f80..5d59b6d7f6 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 e16383b1cc..d6441d1335 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -1791,6 +1791,11 @@ table .span12 { .btn-small [class^="icon-"] { margin-top: -1px; } +.btn-mini { + padding: 2px 6px; + font-size: 11px; + line-height: 14px; +} .btn-primary, .btn-primary:hover, .btn-warning, diff --git a/docs/base-css.html b/docs/base-css.html index 7ab18108c1..c04dc7daa9 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -1313,7 +1313,7 @@ For example, <code>section</code> should be wrapped as inline. </div> <div class="span4"> <h3>Multiple sizes</h3> - <p>Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.</p> + <p>Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.</p> <p> <button class="btn btn-large btn-primary">Primary action</button> <button class="btn btn-large">Action</button> @@ -1322,6 +1322,10 @@ For example, <code>section</code> should be wrapped as inline. <button class="btn btn-small btn-primary">Primary action</button> <button class="btn btn-small">Action</button> </p> + <p> + <button class="btn btn-mini btn-primary">Primary action</button> + <button class="btn btn-mini">Action</button> + </p> <br> <h3>Disabled state</h3> <p>For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.</p> diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index f3d18ffd02..acb9cdcb2d 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -1237,7 +1237,7 @@ </div> <div class="span4"> <h3>{{_i}}Multiple sizes{{/i}}</h3> - <p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code> or <code>.btn-small</code> for two additional sizes.{{/i}}</p> + <p>{{_i}}Fancy larger or smaller buttons? Add <code>.btn-large</code>, <code>.btn-small</code>, or <code>.btn-mini</code> for two additional sizes.{{/i}}</p> <p> <button class="btn btn-large btn-primary">{{_i}}Primary action{{/i}}</button> <button class="btn btn-large">{{_i}}Action{{/i}}</button> @@ -1246,6 +1246,10 @@ <button class="btn btn-small btn-primary">{{_i}}Primary action{{/i}}</button> <button class="btn btn-small">{{_i}}Action{{/i}}</button> </p> + <p> + <button class="btn btn-mini btn-primary">{{_i}}Primary action{{/i}}</button> + <button class="btn btn-mini">{{_i}}Action{{/i}}</button> + </p> <br> <h3>{{_i}}Disabled state{{/i}}</h3> <p>{{_i}}For disabled buttons, add the <code>.disabled</code> class to links and the <code>disabled</code> attribute for <code><button></code> elements.{{/i}}</p> |