Skip to content

B
bootstrap
Commit 24f8d9e1 authored by Mark Otto's avatar Mark Otto
Browse files
Options

don't use table for label variatons

parent 1a546278
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 60 deletions
docs/assets/css/bootstrap.css
View file @ 24f8d9e1
...@@ -4624,11 +4624,10 @@ button.close { ...@@ -4624,11 +4624,10 @@ button.close {
color: #a47e3c; color: #a47e3c;
} }
.close { .alert .close {
position: relative; position: relative;
top: -2px; top: -2px;
right: -21px; right: -21px;
line-height: 20px;
color: inherit; color: inherit;
} }
......
docs/docs.html
View file @ 24f8d9e1
...@@ -3894,56 +3894,20 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline. ...@@ -3894,56 +3894,20 @@ For example, <code>&lt;section&gt;</code> should be wrapped as inline.
<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>
<table class="table table-bordered table-striped"> <div class="bs-docs-example">
<thead> <span class="label">Default</span>
<tr> <span class="label label-success">Success</span>
<th>Labels</th> <span class="label label-warning">Warning</span>
<th>Markup</th> <span class="label label-danger">Danger</span>
</tr> <span class="label label-info">Info</span>
</thead> </div>
<tbody> {% highlight html linenos %}
<tr> <span class="label">Default</span>
<td> <span class="label label-success">Success</span>
<span class="label">Default</span> <span class="label label-warning">Warning</span>
</td> <span class="label label-danger">Danger</span>
<td> <span class="label label-info">Info</span>
<code>&lt;span class="label"&gt;Default&lt;/span&gt;</code> {% endhighlight %}
</td>
</tr>
<tr>
<td>
<span class="label label-success">Success</span>
</td>
<td>
<code>&lt;span class="label label-success"&gt;Success&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
<span class="label label-warning">Warning</span>
</td>
<td>
<code>&lt;span class="label label-warning"&gt;Warning&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
<span class="label label-danger">Danger</span>
</td>
<td>
<code>&lt;span class="label label-danger"&gt;Danger&lt;/span&gt;</code>
</td>
</tr>
<tr>
<td>
<span class="label label-info">Info</span>
</td>
<td>
<code>&lt;span class="label label-info"&gt;Info&lt;/span&gt;</code>
</td>
</tr>
</tbody>
</table>
</div> </div>
......
less/alerts.less
View file @ 24f8d9e1
...@@ -30,15 +30,14 @@ ...@@ -30,15 +30,14 @@
font-weight: 500; font-weight: 500;
color: darken(@state-warning-text, 10%); color: darken(@state-warning-text, 10%);
} }
}
// Adjust close link position // Adjust close link position
.close { .close {
position: relative; position: relative;
top: -2px; top: -2px;
right: -21px; right: -21px;
line-height: @line-height-base; color: inherit;
color: inherit; }
} }
// Alternate styles // Alternate styles
......
less/close.less
View file @ 24f8d9e1
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
color: #000; color: #000;
text-shadow: 0 1px 0 rgba(255,255,255,1); text-shadow: 0 1px 0 rgba(255,255,255,1);
.opacity(.2); .opacity(.2);
&:hover, &:hover,
&:focus { &:focus {
color: #000; color: #000;
......
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