diff options
| author | Mark Otto <[email protected]> | 2012-03-23 09:53:04 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-03-23 09:53:04 -0700 |
| commit | a57554222f091ed3905259b32d1f1a3786e37200 (patch) | |
| tree | 691fd938d03e587a922624b39202c82c157c5282 /docs | |
| parent | 0b4198492002e8aeff6a9106f62c140c82c6c75e (diff) | |
| parent | eb4f708b915c8a7d0948b4837d7c8751de1c930b (diff) | |
| download | bootstrap-a57554222f091ed3905259b32d1f1a3786e37200.tar.xz bootstrap-a57554222f091ed3905259b32d1f1a3786e37200.zip | |
Merge branch '2.0.3-wip' of https://github.com/andriijas/bootstrap into andriijas-2.0.3-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/assets/bootstrap.zip | bin | 55763 -> 55763 bytes | |||
| -rw-r--r-- | docs/components.html | 6 | ||||
| -rw-r--r-- | docs/templates/pages/components.mustache | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/docs/assets/bootstrap.zip b/docs/assets/bootstrap.zip Binary files differindex 02266b313..a07fb5664 100644 --- a/docs/assets/bootstrap.zip +++ b/docs/assets/bootstrap.zip diff --git a/docs/components.html b/docs/components.html index be1143877..1fc8368de 100644 --- a/docs/components.html +++ b/docs/components.html @@ -1422,13 +1422,13 @@ </tr> <tr> <td> - Error + Important </td> <td> - <span class="badge badge-error">6</span> + <span class="badge badge-important">6</span> </td> <td> - <code><span class="badge badge-error">6</span></code> + <code><span class="badge badge-important">6</span></code> </td> </tr> <tr> diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache index 25741608b..2736ffb03 100644 --- a/docs/templates/pages/components.mustache +++ b/docs/templates/pages/components.mustache @@ -1346,13 +1346,13 @@ </tr> <tr> <td> - {{_i}}Error{{/i}} + {{_i}}Important{{/i}} </td> <td> - <span class="badge badge-error">6</span> + <span class="badge badge-important">6</span> </td> <td> - <code><span class="badge badge-error">6</span></code> + <code><span class="badge badge-important">6</span></code> </td> </tr> <tr> |