aboutsummaryrefslogtreecommitdiff
path: root/docs/assets/css
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2013-04-25 14:51:41 -0700
committerMark Otto <[email protected]>2013-04-25 14:51:41 -0700
commit1fc0d2c0f1a226ea77ddf0e2d1026518e713d537 (patch)
tree2cf1b79d76555fbf0d4492a302175feb8bdfb90c /docs/assets/css
parent3e02d127b34703480b48d80427919c5125232cd1 (diff)
parent270db6f55e4c86b0375e32fa3d6eba4038aa15fb (diff)
downloadbootstrap-1fc0d2c0f1a226ea77ddf0e2d1026518e713d537.tar.xz
bootstrap-1fc0d2c0f1a226ea77ddf0e2d1026518e713d537.zip
Merge pull request #7641 from Fowowski/3.0.0-wip
more nested less rules - labels component
Diffstat (limited to 'docs/assets/css')
-rw-r--r--docs/assets/css/bootstrap.css19
1 files changed, 11 insertions, 8 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 624daf46c..c7e2b4eb1 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -4782,6 +4782,7 @@ a.thumbnail:focus {
}
.label {
+ display: inline;
padding: .25em .6em;
font-size: 75%;
font-weight: 500;
@@ -4794,7 +4795,9 @@ a.thumbnail:focus {
border-radius: .25em;
}
+.label[href]:hover,
a.label:hover,
+.label[href]:focus,
a.label:focus {
color: #fff;
text-decoration: none;
@@ -4809,14 +4812,6 @@ a.label:focus {
background-color: #c9302c;
}
-.label-warning {
- background-color: #f0ad4e;
-}
-
-.label-warning[href] {
- background-color: #ec971f;
-}
-
.label-success {
background-color: #5cb85c;
}
@@ -4825,6 +4820,14 @@ a.label:focus {
background-color: #449d44;
}
+.label-warning {
+ background-color: #f0ad4e;
+}
+
+.label-warning[href] {
+ background-color: #ec971f;
+}
+
.label-info {
background-color: #5bc0de;
}