From bc4f5d565ef2a7a8ff71f255d3c147efef4f7039 Mon Sep 17 00:00:00 2001
From: Mark Otto <markotto@twitter.com>
Date: Mon, 1 Oct 2012 12:04:10 -0700
Subject: [PATCH] fixes #5275: inline-block badges and labels, then fix padding
accordingly
---
docs/assets/css/bootstrap.css | 6 ++++--
less/labels-badges.less | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 54046fcd1a..891a754a30 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -5435,6 +5435,8 @@ a.thumbnail:hover {
.label,
.badge {
+ display: inline-block;
+ padding: 2px 4px;
font-size: 11.844px;
font-weight: bold;
line-height: 14px;
@@ -5446,14 +5448,14 @@ a.thumbnail:hover {
}
.label {
- padding: 1px 4px 2px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
}
.badge {
- padding: 1px 9px 2px;
+ padding-right: 9px;
+ padding-left: 9px;
-webkit-border-radius: 9px;
-moz-border-radius: 9px;
border-radius: 9px;
diff --git a/less/labels-badges.less b/less/labels-badges.less
index 2f15fec05f..d118a0190e 100644
--- a/less/labels-badges.less
+++ b/less/labels-badges.less
@@ -6,6 +6,8 @@
// Base classes
.label,
.badge {
+ display: inline-block;
+ padding: 2px 4px;
font-size: @baseFontSize * .846;
font-weight: bold;
line-height: 14px; // ensure proper line-height if floated
@@ -17,11 +19,11 @@
}
// Set unique padding and border-radii
.label {
- padding: 1px 4px 2px;
.border-radius(3px);
}
.badge {
- padding: 1px 9px 2px;
+ padding-left: 9px;
+ padding-right: 9px;
.border-radius(9px);
}
--
GitLab