Commit 1dda3c39 authored by Mark Otto's avatar Mark Otto
Browse files

Merge pull request #6863 from devknoll/fix-css-docs

Fix the Star glyphicon in the CSS docs
parents 63c1377e 876a412c
17 merge requests!7033Fix backdrop undefined bug in modal,!8635ignore Gruntfile.js in jekyll,!8339Fix broken links to navbar component in docs examples,!7329Fix for issue #7328,!7219Fix for mini typo mistake in css.html,!7674Clear float on all when navbar is collapsed - v3,!7344Fixed .spanX selector (*= instead of ^=),!7346Fix compilation error,!7775added some tests for tooltip title setter,!8157Close Me: Docs "Customize and Download" button fix,!7509Proposed fix for allowing Collapse events ('show'/'hide') to be cancelled,!7964commit fixes #7792,!8656Added rel="stylesheet" to CDN-Examples,!8527Inner properties move 1,!8245Interactive color picker - Closed: request against wrong branch,!7865Patch 2,!7651Drop the sizzle dependency to allow smaller builds targeting mobile devices
Showing with 4 additions and 4 deletions
+4 -4
......@@ -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>
......
......@@ -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>
......
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