rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
commit 3e54be9ae6
5 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/css.html
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>