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/templates | |
| 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/templates')
| -rw-r--r-- | docs/templates/pages/base-css.mustache | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/docs/templates/pages/base-css.mustache b/docs/templates/pages/base-css.mustache index 9016570df..c22fa9821 100644 --- a/docs/templates/pages/base-css.mustache +++ b/docs/templates/pages/base-css.mustache @@ -625,6 +625,12 @@ </tr> <tr> <td> + <code>.warning</code> + </td> + <td>{{_i}}Indicates a warning that might need attention.{{/i}}</td> + </tr> + <tr> + <td> <code>.info</code> </td> <td>{{_i}}Used as an alternative to the default styles.{{/i}}</td> @@ -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"> |