rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-01-17 09:52:29 +01:00
Code Issues Actions Packages Releases Activity

Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons

Browse Source
This commit is contained in:
Mark Otto 2012-11-28 00:46:09 -08:00
parent 74f51105e9
commit fda5bb135e
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/assets/css/bootstrap.css vendored
View File

@ -3238,7 +3238,7 @@ button.close {
.btn-large [class^="icon-"], .btn-large [class^="icon-"],
.btn-large [class*=" icon-"] { .btn-large [class*=" icon-"] {
margin-top: 2px; margin-top: 4px;
} }
.btn-small { .btn-small {

8
docs/base-css.html
View File

@ -2076,6 +2076,14 @@ For example, <code><section></code> should be wrapped as inlin
<li><a href="#"><i class="i"></i> Make admin</a></li> <li><a href="#"><i class="i"></i> Make admin</a></li>
</ul> </ul>
</div> </div>
</pre>
<h5>Large button</h5>
<div class="bs-docs-example">
<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
</div>
<pre class="prettyprint linenums">
&lt;a class="btn btn-large" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
</pre> </pre>
<h5>Small button</h5> <h5>Small button</h5>

8
docs/templates/pages/base-css.mustache vendored
View File

@ -2013,6 +2013,14 @@
&lt;li&gt;&lt;a href="#"&gt;&lt;i class="i"&gt;&lt;/i&gt; {{_i}}Make admin{{/i}}&lt;/a&gt;&lt;/li&gt; &lt;li&gt;&lt;a href="#"&gt;&lt;i class="i"&gt;&lt;/i&gt; {{_i}}Make admin{{/i}}&lt;/a&gt;&lt;/li&gt;
&lt;/ul&gt; &lt;/ul&gt;
&lt;/div&gt; &lt;/div&gt;
</pre>
<h5>{{_i}}Large button{{/i}}</h5>
<div class="bs-docs-example">
<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
</div>{{! /bs-docs-example }}
<pre class="prettyprint linenums">
&lt;a class="btn btn-large" href="#"&gt;&lt;i class="icon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
</pre> </pre>
<h5>{{_i}}Small button{{/i}}</h5> <h5>{{_i}}Small button{{/i}}</h5>

2
less/buttons.less
View File

@ -73,7 +73,7 @@
} }
.btn-large [class^="icon-"], .btn-large [class^="icon-"],
.btn-large [class*=" icon-"] { .btn-large [class*=" icon-"] {
margin-top: 2px; margin-top: 4px;
} }
// Small // Small