diff options
| author | Mark Otto <[email protected]> | 2012-02-02 09:38:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-02 09:38:21 -0800 |
| commit | ab4345332da37fc64171088879d7518b59c400a3 (patch) | |
| tree | 8c90fbaabbb329ec741cd3758fbb45ae288965f8 /docs/upgrading.html | |
| parent | bd0e95200390d773b4440d0b7e4cc46091300bbd (diff) | |
| parent | 99f395bcd7ad18ec1ef63b88516e98b294b5bc12 (diff) | |
| download | bootstrap-ab4345332da37fc64171088879d7518b59c400a3.tar.xz bootstrap-ab4345332da37fc64171088879d7518b59c400a3.zip | |
Merge branch 'shama-master' into 2.0.1-wip
Diffstat (limited to 'docs/upgrading.html')
| -rw-r--r-- | docs/upgrading.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/upgrading.html b/docs/upgrading.html index 7398952ba..456afe6a5 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -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> |