Commit fda5bb13 authored by Mark Otto's avatar Mark Otto
Browse files

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

parent 74f51105
3 merge requests!6060Waits to tigger the hidden event,!6055Typeahead complex source,!6061Sorry, close this. I pulled to the wrong branch!
Showing with 18 additions and 2 deletions
+18 -2
......@@ -3238,7 +3238,7 @@ button.close {
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
margin-top: 2px;
margin-top: 4px;
}
.btn-small {
......
......@@ -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>
</ul>
</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>
<h5>Small button</h5>
......
......@@ -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;/ul&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>
<h5>{{_i}}Small button{{/i}}</h5>
......
......@@ -73,7 +73,7 @@
}
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
margin-top: 2px;
margin-top: 4px;
}
// Small
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment