From 24f8d9e1374d88f852402f71de0f728d1e8d62ed Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Tue, 9 Apr 2013 10:43:37 -0700 Subject: [PATCH] don't use table for label variatons --- docs/assets/css/bootstrap.css | 3 +- docs/docs.html | 64 ++++++++--------------------------- less/alerts.less | 15 ++++---- less/close.less | 1 + 4 files changed, 23 insertions(+), 60 deletions(-) diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b4b499e8f6..641de8a4ac 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -4624,11 +4624,10 @@ button.close { color: #a47e3c; } -.close { +.alert .close { position: relative; top: -2px; right: -21px; - line-height: 20px; color: inherit; } diff --git a/docs/docs.html b/docs/docs.html index 0ae2198ad4..e7d7efb586 100644 --- a/docs/docs.html +++ b/docs/docs.html @@ -3894,56 +3894,20 @@ For example, <section> should be wrapped as inline.

Available variations

Add any of the below mentioned modifier classes to change the appearance of a label.

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
LabelsMarkup
- Default - - <span class="label">Default</span> -
- Success - - <span class="label label-success">Success</span> -
- Warning - - <span class="label label-warning">Warning</span> -
- Danger - - <span class="label label-danger">Danger</span> -
- Info - - <span class="label label-info">Info</span> -
+
+ Default + Success + Warning + Danger + Info +
+{% highlight html linenos %} +Default +Success +Warning +Danger +Info +{% endhighlight %} diff --git a/less/alerts.less b/less/alerts.less index 48e4bab422..e3637ead91 100644 --- a/less/alerts.less +++ b/less/alerts.less @@ -30,15 +30,14 @@ font-weight: 500; color: darken(@state-warning-text, 10%); } -} -// Adjust close link position -.close { - position: relative; - top: -2px; - right: -21px; - line-height: @line-height-base; - color: inherit; + // Adjust close link position + .close { + position: relative; + top: -2px; + right: -21px; + color: inherit; + } } // Alternate styles diff --git a/less/close.less b/less/close.less index 2bfe9c40ff..e63a3b2d70 100644 --- a/less/close.less +++ b/less/close.less @@ -11,6 +11,7 @@ color: #000; text-shadow: 0 1px 0 rgba(255,255,255,1); .opacity(.2); + &:hover, &:focus { color: #000;