mirror/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-24 12:40:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip

Browse Source
This commit is contained in:
Jacob Thornton 2013-07-28 22:23:56 -07:00
commit 8eb42d9b20
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
css.html
View File

@ -91,16 +91,20 @@ base_url: "../"
<tr> <tr>
<th></th> <th></th>
<th> <th>
Tiny grid Tiny devices
<small>Phones (&lt;480px)</small> <small>Phones (&lt;480px)</small>
</th> </th>
<th> <th>
Small grid Small devices
<small>Tablets (&lt;768px)</small> <small>Tablets (&lt;768px)</small>
</th> </th>
<th> <th>
Medium-large grid Medium devices
<small>Desktops (&gt;768px)</small> <small>Desktops (&gt;992px)</small>
</th>
<th>
Large devices
<small>Desktops (&gt;1200px)</small>
</th> </th>
</tr> </tr>
</thead> </thead>
@ -108,31 +112,49 @@ base_url: "../"
<tr> <tr>
<th>Grid behavior</th> <th>Grid behavior</th>
<td>Horizontal at all times</td> <td>Horizontal at all times</td>
<td colspan="2">Collapsed to start, horizontal above breakpoints</td> <td colspan="3">Collapsed to start, horizontal above breakpoints</td>
</tr>
<tr>
<th>Max container width</th>
<td>None (auto)</td>
<td>728px</td>
<td>940px</td>
<td>1170px</td>
</tr> </tr>
<tr> <tr>
<th>Class prefix</th> <th>Class prefix</th>
<td><code>.col-</code></td> <td><code>.col-</code></td>
<td><code>.col-sm-</code></td> <td><code>.col-sm-</code></td>
<td><code>.col-lg-</code></td> <td colspan="2"><code>.col-lg-</code></td>
</tr> </tr>
<tr> <tr>
<th># of columns</th> <th># of columns</th>
<td colspan="3">12</td> <td colspan="4">12</td>
</tr>
<tr>
<th>Max column width</th>
<td>Auto</td>
<td>~60px</td>
<td>~78px</td>
<td>~98px</td>
</tr>
<tr>
<th>Gutter width</th>
<td colspan="4">30px (15px on each side of a column)</td>
</tr> </tr>
<tr> <tr>
<th>Nestable</th> <th>Nestable</th>
<td colspan="3">Yes</td> <td colspan="4">Yes</td>
</tr> </tr>
<tr> <tr>
<th>Offsets</th> <th>Offsets</th>
<td colspan="2" class="text-muted">N/A</td> <td colspan="2" class="text-muted">N/A</td>
<td>Yes</td> <td colspan="2">Yes</td>
</tr> </tr>
<tr> <tr>
<th>Column ordering</th> <th>Column ordering</th>
<td class="text-muted">N/A</td> <td class="text-muted">N/A</td>
<td colspan="2">Yes</td> <td colspan="3">Yes</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
@ -1403,7 +1425,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
{% endhighlight %} {% endhighlight %}
<h3>Selects</h3> <h3>Selects</h3>
<p>Use the default option or specify a <code>multiple="multiple"</code> to show multiple options at once.</p> <p>Use the default option, or add <code>multiple</code> to show multiple options at once.</p>
<form class="bs-example"> <form class="bs-example">
<select class="form-control"> <select class="form-control">
<option>1</option> <option>1</option>
@ -1413,7 +1435,7 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<option>5</option> <option>5</option>
</select> </select>
<br> <br>
<select multiple="multiple" class="form-control"> <select multiple class="form-control">
<option>1</option> <option>1</option>
<option>2</option> <option>2</option>
<option>3</option> <option>3</option>