aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-12-24 02:06:28 -0800
committerMark Otto <[email protected]>2012-12-24 02:06:28 -0800
commitd206ec16595a022f10955eb025fd5756512399a8 (patch)
tree0a2651afcab1a0fc03399121febfdef31dc15910
parent7c04d573d0a08a365f3350c9d52d7cc870f702be (diff)
downloadbootstrap-d206ec16595a022f10955eb025fd5756512399a8.tar.xz
bootstrap-d206ec16595a022f10955eb025fd5756512399a8.zip
Remove .badge-info and .badge-inverse; change docs label of .badge-important to .badge-danger
-rw-r--r--docs/assets/css/bootstrap.css16
-rw-r--r--docs/components.html24
-rw-r--r--docs/templates/pages/components.mustache24
-rw-r--r--less/badges.less6
4 files changed, 2 insertions, 68 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 44581d473..b5ef18ebb 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4523,22 +4523,6 @@ a.badge:hover {
background-color: #356635;
}
-.badge-info {
- background-color: #3a87ad;
-}
-
-.badge-info[href] {
- background-color: #2d6987;
-}
-
-.badge-inverse {
- background-color: #333333;
-}
-
-.badge-inverse[href] {
- background-color: #1a1a1a;
-}
-
.btn .badge {
position: relative;
top: -1px;
diff --git a/docs/components.html b/docs/components.html
index ac9dc91ce..b870c1f3f 100644
--- a/docs/components.html
+++ b/docs/components.html
@@ -1478,7 +1478,7 @@
</tr>
<tr>
<td>
- Important
+ Danger
</td>
<td>
<span class="badge badge-danger">6</span>
@@ -1487,28 +1487,6 @@
<code>&lt;span class="badge badge-danger"&gt;6&lt;/span&gt;</code>
</td>
</tr>
- <tr>
- <td>
- Info
- </td>
- <td>
- <span class="badge badge-info">8</span>
- </td>
- <td>
- <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
- </td>
- </tr>
- <tr>
- <td>
- Inverse
- </td>
- <td>
- <span class="badge badge-inverse">10</span>
- </td>
- <td>
- <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
- </td>
- </tr>
</tbody>
</table>
diff --git a/docs/templates/pages/components.mustache b/docs/templates/pages/components.mustache
index 4db9d84dc..b3d0b29ea 100644
--- a/docs/templates/pages/components.mustache
+++ b/docs/templates/pages/components.mustache
@@ -1410,7 +1410,7 @@
</tr>
<tr>
<td>
- Important
+ Danger
</td>
<td>
<span class="badge badge-danger">6</span>
@@ -1419,28 +1419,6 @@
<code>&lt;span class="badge badge-danger"&gt;6&lt;/span&gt;</code>
</td>
</tr>
- <tr>
- <td>
- Info
- </td>
- <td>
- <span class="badge badge-info">8</span>
- </td>
- <td>
- <code>&lt;span class="badge badge-info"&gt;8&lt;/span&gt;</code>
- </td>
- </tr>
- <tr>
- <td>
- Inverse
- </td>
- <td>
- <span class="badge badge-inverse">10</span>
- </td>
- <td>
- <code>&lt;span class="badge badge-inverse"&gt;10&lt;/span&gt;</code>
- </td>
- </tr>
</tbody>
</table>
diff --git a/less/badges.less b/less/badges.less
index b8de24df1..5511bc81f 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -44,12 +44,6 @@ a.badge {
// Success (green)
&-success { background-color: @state-success-text; }
&-success[href] { background-color: darken(@state-success-text, 10%); }
- // Info (turquoise)
- &-info { background-color: @state-info-text; }
- &-info[href] { background-color: darken(@state-info-text, 10%); }
- // Inverse (black)
- &-inverse { background-color: @grayDark; }
- &-inverse[href] { background-color: darken(@grayDark, 10%); }
}
// Quick fix for labels/badges in buttons