kotovalexarian-likes-github/twbs--bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2022-11-09 12:25:43 -05:00
Code Releases Activity

add mini buttons per #1971

Browse source
This commit is contained in:
Mark Otto 2012-02-16 21:28:16 -08:00
parent 61e2201c64
commit 268e7d67ab
5 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
docs/assets/bootstrap.zip
View file

Binary file not shown.

5
docs/assets/css/bootstrap.css vendored
View file

@ -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,

6
docs/base-css.html
View file

@ -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, &lt;code&gt;section&lt;/code&gt; 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>&lt;button&gt;</code> elements.</p>

6
docs/templates/pages/base-css.mustache vendored
View file

@ -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>&lt;button&gt;</code> elements.{{/i}}</p>

7
less/buttons.less
View file

@ -92,6 +92,13 @@
margin-top: -1px;
}
// Mini
.btn-mini {
padding: 2px 6px;
font-size: @baseFontSize - 2px;
line-height: @baseLineHeight - 4px;
}
// Alternate buttons
// --------------------------------------------------