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/components.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/components.html')
| -rw-r--r-- | docs/components.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/components.html b/docs/components.html index c40d55613..bd2e437a5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1021,7 +1021,7 @@ <div class="row"> <div class="span4"> <h3>About pager</h3> - <p>The pager component is a set of links for simple pagination implemenations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.</p> + <p>The pager component is a set of links for simple pagination implementations with light markup and even lighter styles. It's great for simple sites like blogs or magazines.</p> </div> <div class="span4"> <h3>Default example</h3> @@ -1282,7 +1282,7 @@ <div class="row"> <div class="span4"> <h3>Rewritten base class</h3> - <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup—no <code><p></code> is required by default, just the outter <code><div></code>.</p> + <p>With Bootstrap 2, we've simplified the base class: <code>.alert</code> instead of <code>.alert-message</code>. We've also reduced the minimum required markup—no <code><p></code> is required by default, just the outer <code><div></code>.</p> <h3>Single alert message</h3> <p>For a more durable component with less code, we've removed the differentiating look for block alerts, messages that come with more padding and typically more text. The class also has changed to <code>.alert-block</code>.</p> <hr> |