Skip to content

B
bootstrap
Commit b1e7010b authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

parents 1f5f23f8 1dda3c39
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
docs/css.html
View file @ b1e7010b
......@@ -2170,10 +2170,10 @@ For example, <code><section></code> should be wrapped
<h5>Large button</h5>
<div class="bs-docs-example">
<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
<a class="btn btn-large" href="#"><i class="glyphicon-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;
&lt;a class="btn btn-large" href="#"&gt;&lt;i class="glyphicon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
</pre>
<h5>Small button</h5>
......
docs/templates/pages/css.mustache
View file @ b1e7010b
......@@ -2110,10 +2110,10 @@ For example, &lt;code&gt;&amp;lt;section&amp;gt;&lt;/code&gt; should be wrapped
<h5>Large button</h5>
<div class="bs-docs-example">
<a class="btn btn-large" href="#"><i class="icon-star"></i> Star</a>
<a class="btn btn-large" href="#"><i class="glyphicon-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;
&lt;a class="btn btn-large" href="#"&gt;&lt;i class="glyphicon-star"&gt;&lt;/i&gt; Star&lt;/a&gt;
</pre>
<h5>Small button</h5>
......
Markdown is supported
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