Commit c4281f39 authored by Mark Otto's avatar Mark Otto

Update labels to include a base class

* Builds on the new button styles by requiring a `.btn-default` for the
regular, gray labels
* Updates components examples to show new stuff
parent 844df9e0
...@@ -1629,28 +1629,28 @@ body { padding-bottom: 70px; } ...@@ -1629,28 +1629,28 @@ body { padding-bottom: 70px; }
<h3>Example</h3> <h3>Example</h3>
<div class="bs-example"> <div class="bs-example">
<h1>Example heading <span class="label">New</span></h1> <h1>Example heading <span class="label label-default">New</span></h1>
<h2>Example heading <span class="label">New</span></h2> <h2>Example heading <span class="label label-default">New</span></h2>
<h3>Example heading <span class="label">New</span></h3> <h3>Example heading <span class="label label-default">New</span></h3>
<h4>Example heading <span class="label">New</span></h4> <h4>Example heading <span class="label label-default">New</span></h4>
<h5>Example heading <span class="label">New</span></h5> <h5>Example heading <span class="label label-default">New</span></h5>
<h6>Example heading <span class="label">New</span></h6> <h6>Example heading <span class="label label-default">New</span></h6>
</div> </div>
{% highlight html %} {% highlight html %}
<h3>Example heading <span class="label">New</span></h3> <h3>Example heading <span class="label label-default">New</span></h3>
{% endhighlight %} {% endhighlight %}
<h3>Available variations</h3> <h3>Available variations</h3>
<p>Add any of the below mentioned modifier classes to change the appearance of a label.</p> <p>Add any of the below mentioned modifier classes to change the appearance of a label.</p>
<div class="bs-example"> <div class="bs-example">
<span class="label">Default</span> <span class="label label-default">Default</span>
<span class="label label-success">Success</span> <span class="label label-success">Success</span>
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-danger">Danger</span> <span class="label label-danger">Danger</span>
<span class="label label-info">Info</span> <span class="label label-info">Info</span>
</div> </div>
{% highlight html %} {% highlight html %}
<span class="label">Default</span> <span class="label label-default">Default</span>
<span class="label label-success">Success</span> <span class="label label-success">Success</span>
<span class="label label-warning">Warning</span> <span class="label label-warning">Warning</span>
<span class="label label-danger">Danger</span> <span class="label label-danger">Danger</span>
......
...@@ -4073,7 +4073,6 @@ a.thumbnail:focus { ...@@ -4073,7 +4073,6 @@ a.thumbnail:focus {
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: baseline; vertical-align: baseline;
background-color: #999999;
border-radius: .25em; border-radius: .25em;
} }
...@@ -4085,6 +4084,15 @@ a.thumbnail:focus { ...@@ -4085,6 +4084,15 @@ a.thumbnail:focus {
background-color: #808080; background-color: #808080;
} }
.label-default {
background-color: #999999;
}
.label-default[href]:hover,
.label-default[href]:focus {
background-color: #808080;
}
.label-danger { .label-danger {
background-color: #d9534f; background-color: #d9534f;
} }
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
vertical-align: baseline; vertical-align: baseline;
background-color: @gray-light;
border-radius: .25em; border-radius: .25em;
// Add hover effects, but only for links // Add hover effects, but only for links
...@@ -29,6 +28,11 @@ ...@@ -29,6 +28,11 @@
// Colors // Colors
// Contextual variations (linked labels get darker on :hover) // Contextual variations (linked labels get darker on :hover)
.label-default {
.label-variant(@label-default-bg);
}
.label-danger { .label-danger {
.label-variant(@label-danger-bg); .label-variant(@label-danger-bg);
} }
......
...@@ -375,6 +375,8 @@ ...@@ -375,6 +375,8 @@
// Labels // Labels
// ------------------------- // -------------------------
@label-default-bg: @gray-light;
@label-success-bg: @brand-success; @label-success-bg: @brand-success;
@label-info-bg: @brand-info; @label-info-bg: @brand-info;
@label-warning-bg: @brand-warning; @label-warning-bg: @brand-warning;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment