rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into docs_derp

Browse source 
Conflicts:
	docs/assets/css/docs.css
This commit is contained in:
Mark Otto 2014-01-09 20:33:55 -08:00
commit ea20f44815
65 changed files with 2742 additions and 1919 deletions
Download patch file Download diff file Expand all files Collapse all files

9
docs/getting-started.html
View file

@ -446,6 +446,10 @@ bootstrap/
<td><code>.input-large</code></td>
<td><code>.input-lg</code></td>
</tr>
<tr>
<td><code>.input-block-level</code></td>
<td><code>.form-control</code></td>
</tr>
<tr>
<td><code>.control-group</code></td>
<td><code>.form-group</code></td>
@ -673,6 +677,11 @@ bootstrap/
<td><code>.control-group.info</code></td>
<td class="text-muted">N/A</td>
</tr>
<tr>
<td>Block level from input</td>
<td><code>.input-block-level</code></td>
<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>