From 0f3b176a763abdaddfe3f538cc386b2b15456d0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= <legospace9876@gmail.com>
Date: Fri, 7 Mar 2014 18:54:53 +0100
Subject: [PATCH] Improve badges mixinability
---
less/badges.less | 36 ++++++++++++++++++------------------
less/labels.less | 2 +-
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/less/badges.less b/less/badges.less
index 56828cab7c..20624f30db 100644
--- a/less/badges.less
+++ b/less/badges.less
@@ -3,7 +3,7 @@
// --------------------------------------------------
-// Base classes
+// Base class
.badge {
display: inline-block;
min-width: 10px;
@@ -32,24 +32,24 @@
top: 0;
padding: 1px 5px;
}
-}
-// Hover state, but only for links
-a.badge {
- &:hover,
- &:focus {
- color: @badge-link-hover-color;
- text-decoration: none;
- cursor: pointer;
+ // Hover state, but only for links
+ a& {
+ &:hover,
+ &:focus {
+ color: @badge-link-hover-color;
+ text-decoration: none;
+ cursor: pointer;
+ }
}
-}
-// Account for counters in navs
-a.list-group-item.active > .badge,
-.nav-pills > .active > a > .badge {
- color: @badge-active-color;
- background-color: @badge-active-bg;
-}
-.nav-pills > li > a > .badge {
- margin-left: 3px;
+ // Account for badges in navs
+ a.list-group-item.active > &,
+ .nav-pills > .active > a > & {
+ color: @badge-active-color;
+ background-color: @badge-active-bg;
+ }
+ .nav-pills > li > a > & {
+ margin-left: 3px;
+ }
}
diff --git a/less/labels.less b/less/labels.less
index 5db1ed12c0..9a5a27006a 100644
--- a/less/labels.less
+++ b/less/labels.less
@@ -15,7 +15,7 @@
border-radius: .25em;
// Add hover effects, but only for links
- &[href] {
+ a& {
&:hover,
&:focus {
color: @label-link-hover-color;
--
GitLab