aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-11-28 00:46:09 -0800
committerMark Otto <[email protected]>2012-11-28 00:46:09 -0800
commitfda5bb135e0a91f335f1e3bd4e5313070f6e0708 (patch)
tree37bdb3e154e1393ccc3f377f809e1f6e79c14c64 /docs
parent74f51105e980176caddda430959ffc536b3610ec (diff)
downloadbootstrap-fda5bb135e0a91f335f1e3bd4e5313070f6e0708.tar.xz
bootstrap-fda5bb135e0a91f335f1e3bd4e5313070f6e0708.zip
Fixes #5963: Add large button example to icons, fix vertical alignment in large buttons
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--docs/base-css.html8
-rw-r--r--docs/templates/pages/base-css.mustache8
3 files changed, 17 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index f2cd3d3e9..ed58d7aaf 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -3238,7 +3238,7 @@ button.close {
.btn-large [class^="icon-"],
.btn-large [class*=" icon-"] {
- margin-top: 2px;
+ margin-top: 4px;
}
.btn-small {
diff --git a/docs/base-css.html b/docs/base-css.html
index fee6fc897..69229231f 100644
--- a/docs/base-css.html
+++ b/docs/base-css.html
@@ -2078,6 +2078,14 @@ For example, &lt;code&gt;&lt;section&gt;&lt;/code&gt; should be wrapped as inlin
&lt;/div&gt;
</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>
<div class="bs-docs-example">
<a class="btn btn-small" href="#"><i class="icon-star"></i></a>
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache
index 29c4cebb1..17f446b3d 100644
--- a/docs/templates/pages/base-css.mustache
+++ b/docs/templates/pages/base-css.mustache
@@ -2015,6 +2015,14 @@
&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>
<div class="bs-docs-example">
<a class="btn btn-small" href="#"><i class="icon-star"></i></a>