aboutsummaryrefslogtreecommitdiff
path: root/docs/getting-started.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2014-01-11 14:49:03 -0800
committerMark Otto <[email protected]>2014-01-11 14:49:03 -0800
commite2908975ad9beebb2b9bfd2ab8dbaa59577b1a0f (patch)
tree2d8a23cabd2774f378aed220e37e378fb2d723c4 /docs/getting-started.html
parent1127cd62871aaf5bf70b23859a8520c6edbd57d7 (diff)
parent8e41961f9e24c8fe4cc18d62a4e55a1f8bcb3d1f (diff)
downloadbootstrap-e2908975ad9beebb2b9bfd2ab8dbaa59577b1a0f.tar.xz
bootstrap-e2908975ad9beebb2b9bfd2ab8dbaa59577b1a0f.zip
Merge branch 'master' of github.com:twbs/bootstrap
Diffstat (limited to 'docs/getting-started.html')
-rw-r--r--docs/getting-started.html11
1 files changed, 1 insertions, 10 deletions
diff --git a/docs/getting-started.html b/docs/getting-started.html
index b46c2d0a2..e03735499 100644
--- a/docs/getting-started.html
+++ b/docs/getting-started.html
@@ -350,10 +350,6 @@ bootstrap/
</thead>
<tbody>
<tr>
- <td><code>.container-fluid</code></td>
- <td><code>.container</code></td>
- </tr>
- <tr>
<td><code>.row-fluid</code></td>
<td><code>.row</code></td>
</tr>
@@ -678,11 +674,6 @@ bootstrap/
<td>No direct equivalent, but <a href="../css/#forms-controls">forms controls</a> are similar.</td>
</tr>
<tr>
- <td>Fluid container</td>
- <td><code>.container-fluid</code></td>
- <td><code>.container</code> (no more fixed grid)</td>
- </tr>
- <tr>
<td>Fluid row</td>
<td><code>.row-fluid</code></td>
<td><code>.row</code> (no more fixed grid)</td>
@@ -744,7 +735,7 @@ bootstrap/
<li>Text-based form controls with the <code>.form-control</code> class applied are now 100% wide by default. Wrap inputs inside <code>&lt;div class="col-*"&gt;&lt;/div&gt;</code> to control input widths.</li>
<li><code>.badge</code> no longer has contextual (-success,-primary,etc..) classes.</li>
<li><code>.btn</code> must also use <code>.btn-default</code> to get the "default" button.</li>
- <li><code>.container</code> and <code>.row</code> are now fluid (percentage-based).</li>
+ <li><code>.row</code> is now fluid.</li>
<li>Images are no longer responsive by default. Use <code>.img-responsive</code> for fluid <code>&lt;img&gt;</code> size.</li>
<li>The icons, now <code>.glyphicon</code>, are now font based. Icons also require a base and icon class (e.g. <code>.glyphicon .glyphicon-asterisk</code>).</li>
<li>Typeahead has been dropped, in favor of using <a href="http://twitter.github.io/typeahead.js/">Twitter Typeahead</a>.</li>