Merge branch 'shama-master' into 2.0.1-wip

This commit is contained in:
Mark Otto
2012-02-02 09:38:21 -08:00
10 changed files with 18 additions and 18 deletions

View File

@@ -221,7 +221,7 @@
<ul>
<li>New base class: <code>.alert</code> instead of <code>.alert-message</code></li>
<li>Class names standardized for other options, now all starting with <code>.alert-</code></li>
<li>Redesigned base alert styles to combine the deafult alerts and block-level alerts into one</li>
<li>Redesigned base alert styles to combine the default alerts and block-level alerts into one</li>
<li>Block level alert class changed: <code>.alert-block</code> instead of <code>.block-message</code></li>
</ul>
<h3>Progress bars</h3>