diff options
| author | Mark Otto <[email protected]> | 2012-08-23 09:47:44 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-08-23 09:47:44 -0700 |
| commit | 5cbb8269619a42fe466d65e11b4dc730bcfe89cd (patch) | |
| tree | d2d3901f39e25e93e51470025df7bedee9da6462 /docs/base-css.html | |
| parent | be64955e25b4efb48fe140d0a8a05f9c34bbf285 (diff) | |
| parent | a9764c34a7ece4213d50a8e0714ebd001daac529 (diff) | |
| download | bootstrap-5cbb8269619a42fe466d65e11b4dc730bcfe89cd.tar.xz bootstrap-5cbb8269619a42fe466d65e11b4dc730bcfe89cd.zip | |
Merge pull request #4560 from andriijas/2.1.1-wip-table-row-warning
.warning for table tr and .info for .control-group
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 095fbc6b7..7671d2ad6 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -688,6 +688,12 @@ For example, <code><section></code> should be wrapped as inlin </tr> <tr> <td> + <code>.warning</code> + </td> + <td>Indicates a warning that might need attention.</td> + </tr> + <tr> + <td> <code>.info</code> </td> <td>Used as an alternative to the default styles.</td> @@ -717,12 +723,18 @@ For example, <code><section></code> should be wrapped as inlin <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> @@ -1355,7 +1367,7 @@ For example, <code><section></code> should be wrapped as inlin </pre> <h3>Validation states</h3> - <p>Bootstrap includes validation styles for error, warning, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.</p> + <p>Bootstrap includes validation styles for error, warning, info, and success messages. To use, add the appropriate class to the surrounding <code>.control-group</code>.</p> <form class="bs-docs-example form-horizontal"> <div class="control-group warning"> @@ -1372,6 +1384,13 @@ For example, <code><section></code> should be wrapped as inlin <span class="help-inline">Please correct the error</span> </div> </div> + <div class="control-group info"> + <label class="control-label" for="inputError">Input with info</label> + <div class="controls"> + <input type="text" id="inputError"> + <span class="help-inline">Username is taken</span> + </div> + </div> <div class="control-group success"> <label class="control-label" for="inputSuccess">Input with success</label> <div class="controls"> |