mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-21 13:24:08 +03:00
Code Activity

Merge branch 'master' into docs_derp

Browse Source 
Conflicts:
	docs/components.html
This commit is contained in:
Mark Otto
2014-01-05 23:19:34 -08:00
parent 12dacee313 422bdc50f9
commit 3e54be9ae6
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/css.html
-1
View File
@@ -2414,7 +2414,6 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<p class="bg-danger">Donec ullamcorper nulla non metus auctor fringilla.</p>
</div>
{% highlight html %}
<p class="bg-muted">...</p>
<p class="bg-primary">...</p>
<p class="bg-success">...</p>
<p class="bg-info">...</p>