diff options
| author | Mark Otto <[email protected]> | 2014-06-10 21:20:34 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-06-10 21:20:34 -0700 |
| commit | dcbe484a09531da4ecc80fd2991a9910fb6a64ed (patch) | |
| tree | 7846d5e66582974cb9e19a98f342b6a3f65b3f73 /docs/_includes | |
| parent | e8100c3b3ced15114db8038a6dac7d9878f2c331 (diff) | |
| download | bootstrap-dcbe484a09531da4ecc80fd2991a9910fb6a64ed.tar.xz bootstrap-dcbe484a09531da4ecc80fd2991a9910fb6a64ed.zip | |
New text align class, .text-nowrap, for preventing text from breaking to new lines. Applies it to the grid docs table.
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/css/grid.html | 18 | ||||
| -rw-r--r-- | docs/_includes/css/type.html | 3 |
2 files changed, 11 insertions, 10 deletions
diff --git a/docs/_includes/css/grid.html b/docs/_includes/css/grid.html index 0deb12458..593b02a43 100644 --- a/docs/_includes/css/grid.html +++ b/docs/_includes/css/grid.html @@ -68,49 +68,49 @@ </thead> <tbody> <tr> - <th>Grid behavior</th> + <th class="text-nowrap">Grid behavior</th> <td>Horizontal at all times</td> <td colspan="3">Collapsed to start, horizontal above breakpoints</td> </tr> <tr> - <th>Container width</th> + <th class="text-nowrap">Container width</th> <td>None (auto)</td> <td>750px</td> <td>970px</td> <td>1170px</td> </tr> <tr> - <th>Class prefix</th> + <th class="text-nowrap">Class prefix</th> <td><code>.col-xs-</code></td> <td><code>.col-sm-</code></td> <td><code>.col-md-</code></td> <td><code>.col-lg-</code></td> </tr> <tr> - <th># of columns</th> + <th class="text-nowrap"># of columns</th> <td colspan="4">12</td> </tr> <tr> - <th>Column width</th> + <th class="text-nowrap">Column width</th> <td class="text-muted">Auto</td> <td>~62px</td> <td>~81px</td> <td>~97px</td> </tr> <tr> - <th>Gutter width</th> + <th class="text-nowrap">Gutter width</th> <td colspan="4">30px (15px on each side of a column)</td> </tr> <tr> - <th>Nestable</th> + <th class="text-nowrap">Nestable</th> <td colspan="4">Yes</td> </tr> <tr> - <th>Offsets</th> + <th class="text-nowrap">Offsets</th> <td colspan="4">Yes</td> </tr> <tr> - <th>Column ordering</th> + <th class="text-nowrap">Column ordering</th> <td colspan="4">Yes</td> </tr> </tbody> diff --git a/docs/_includes/css/type.html b/docs/_includes/css/type.html index da81d7414..65001198d 100644 --- a/docs/_includes/css/type.html +++ b/docs/_includes/css/type.html @@ -195,12 +195,13 @@ You can use the mark tag to <mark>highlight</mark> text. <p class="text-center">Center aligned text.</p> <p class="text-right">Right aligned text.</p> <p class="text-justify">Justified text.</p> + <p class="text-nowrap">No wrap text.</p> </div> {% highlight html %} <p class="text-left">Left aligned text.</p> <p class="text-center">Center aligned text.</p> <p class="text-right">Right aligned text.</p> -<p class="text-justify">Justified text.</p> +<p class="text-nowrap">No wrap text.</p> {% endhighlight %} |
