Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning

.warning for table tr  and .info for .control-group
This commit is contained in:
Mark Otto
2012-08-23 09:47:44 -07:00
5 changed files with 92 additions and 4 deletions

View File

@@ -623,6 +623,12 @@
</td>
<td>{{_i}}Indicates a dangerous or potentially negative action.{{/i}}</td>
</tr>
<tr>
<td>
<code>.warning</code>
</td>
<td>{{_i}}Indicates a warning that might need attention.{{/i}}</td>
</tr>
<tr>
<td>
<code>.info</code>
@@ -654,12 +660,18 @@
<td>02/04/2012</td>
<td>Declined</td>
</tr>
<tr class="info">
<tr class="warning">
<td>3</td>
<td>TB - Monthly</td>
<td>03/04/2012</td>
<td>Pending</td>
</tr>
<tr class="info">
<td>4</td>
<td>TB - Monthly</td>
<td>04/04/2012</td>
<td>Call in to confirm</td>
</tr>
</tbody>
</table>
</div>{{! /example }}
@@ -1292,7 +1304,7 @@
</pre>
<h3>{{_i}}Validation states{{/i}}</h3>
<p>{{_i}}Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.{{/i}}</p>
<p>{{_i}}Bootstrap includes validation styles for error, warning, info, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.{{/i}}</p>
<form class="bs-docs-example form-horizontal">
<div class="control-group warning">
@@ -1309,6 +1321,13 @@
<span class="help-inline">{{_i}}Please correct the error{{/i}}</span>
</div>
</div>
<div class="control-group info">
<label class="control-label" for="inputError">{{_i}}Input with info{{/i}}</label>
<div class="controls">
<input type="text" id="inputError">
<span class="help-inline">{{_i}}Username is taken{{/i}}</span>
</div>
</div>
<div class="control-group success">
<label class="control-label" for="inputSuccess">{{_i}}Input with success{{/i}}</label>
<div class="controls">