diff options
| author | Julian Thilo <[email protected]> | 2014-01-07 22:24:45 +0100 |
|---|---|---|
| committer | Julian Thilo <[email protected]> | 2014-01-07 22:24:45 +0100 |
| commit | 8fd177bfa78d3e742486a66450465f3716cd11b2 (patch) | |
| tree | 70464468ed5a225b294c4da72649051a56e6a417 /docs/css.html | |
| parent | 5f328dce889823f1ec78844427a48da4c2eb6638 (diff) | |
| download | bootstrap-8fd177bfa78d3e742486a66450465f3716cd11b2.tar.xz bootstrap-8fd177bfa78d3e742486a66450465f3716cd11b2.zip | |
Fix #12073: Consistent order of variations
This changes the order of component variations throughout the repo (code and docs) to be more consistent.
The order now used everywhere is the one most frequently found in the repo before:
Default, Primary, Success, Info, Warning, Danger
Diffstat (limited to 'docs/css.html')
| -rw-r--r-- | docs/css.html | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/docs/css.html b/docs/css.html index e1adcaaa4..d96bf367e 100644 --- a/docs/css.html +++ b/docs/css.html @@ -1312,21 +1312,21 @@ For example, <code><section></code> should be wrapped as inline. </tr> <tr> <td> - <code>.warning</code> + <code>.info</code> </td> - <td>Indicates a warning that might need attention</td> + <td>Indicates a neutral informative change or action</td> </tr> <tr> <td> - <code>.danger</code> + <code>.warning</code> </td> - <td>Indicates a dangerous or potentially negative action</td> + <td>Indicates a warning that might need attention</td> </tr> <tr> <td> - <code>.info</code> + <code>.danger</code> </td> - <td>Indicates a neutral informative change or action</td> + <td>Indicates a dangerous or potentially negative action</td> </tr> </tbody> </table> @@ -1366,7 +1366,7 @@ For example, <code><section></code> should be wrapped as inline. <td>Column content</td> <td>Column content</td> </tr> - <tr class="warning"> + <tr class="info"> <td>5</td> <td>Column content</td> <td>Column content</td> @@ -1378,7 +1378,7 @@ For example, <code><section></code> should be wrapped as inline. <td>Column content</td> <td>Column content</td> </tr> - <tr class="danger"> + <tr class="warning"> <td>7</td> <td>Column content</td> <td>Column content</td> @@ -1390,7 +1390,7 @@ For example, <code><section></code> should be wrapped as inline. <td>Column content</td> <td>Column content</td> </tr> - <tr class="info"> + <tr class="danger"> <td>9</td> <td>Column content</td> <td>Column content</td> @@ -2848,17 +2848,17 @@ For example, <code><section></code> should be wrapped as inline. <div class="color-swatches"> <div class="color-swatch brand-primary"></div> <div class="color-swatch brand-success"></div> + <div class="color-swatch brand-info"></div> <div class="color-swatch brand-warning"></div> <div class="color-swatch brand-danger"></div> - <div class="color-swatch brand-info"></div> </div> </div> {% highlight css %} @brand-primary: #428bca; @brand-success: #5cb85c; +@brand-info: #5bc0de; @brand-warning: #f0ad4e; @brand-danger: #d9534f; -@brand-info: #5bc0de; {% endhighlight %} <p>Use any of these color variables as they are or reassign them to more meaningful variables for your project.</p> |