From 9330c4a947f023a4524b3e884be1d11ccef09cd7 Mon Sep 17 00:00:00 2001
From: Mark Otto <markdotto@gmail.com>
Date: Wed, 5 Aug 2015 00:45:41 -0700
Subject: [PATCH] Run just as fast as I can To the middle of nowhere To the
middle of my frustrated fears And I swear you're just like a pill Instead of
makin' me better, You keep makin' me ill You keep makin' me ill
adds .label-pill to replace .badge
---
dist/css/bootstrap-flex.css | 5 +++++
dist/css/bootstrap-flex.css.map | Bin 114304 -> 114387 bytes
dist/css/bootstrap.css | 5 +++++
dist/css/bootstrap.css.map | Bin 112311 -> 112394 bytes
docs/components/label.md | 13 +++++++++++++
scss/_labels.scss | 10 ++++++++++
6 files changed, 33 insertions(+)
diff --git a/dist/css/bootstrap-flex.css b/dist/css/bootstrap-flex.css
index dcb6bb6edd..4c33252302 100644
--- a/dist/css/bootstrap-flex.css
+++ b/dist/css/bootstrap-flex.css
@@ -3278,6 +3278,11 @@ a.label:hover {
text-decoration: none;
cursor: pointer; }
+.label-pill {
+ padding-left: .6em;
+ padding-right: .6em;
+ border-radius: 1rem; }
+
.label-default {
background-color: #818a91; }
.label-default[href]:focus,
diff --git a/dist/css/bootstrap-flex.css.map b/dist/css/bootstrap-flex.css.map
index b7b0c6d76bdbd8c8b7173d056804c03168bf7bf5..8df125ced456d2a2c336fbfa666fcbaf6dc6e441 100644
GIT binary patch
delta 353
zcmZqp%XaxMTf-K{Hb>@Sr=;oUVi~14Jslmrtz8|R^QP~2Wfb>HbaYJAadmWb)d5N9
zxI21;SX(<fh9~JHJ31!oI6FEzTf62v<+vp2q&qn}raS4l8aoGu>-al5`s=utIvF?@
zI9a=9J7qafPjq4|7A|x~(^=v&-NA`boC~I~2%^xW5?!GoiWP|nE6ku)R6%qKnE`c%
z1DyzWoaOXhXGRImbeA%)Q_QEYb7m|t$po5*>IYY3Kcpfo$aR7G!3F9EpiXeOz<gig
YI{l6dqXbv6OA*+HBA4y|To{`w0Vh{!_y7O^
delta 323
zcmccom#qPawlKCinv^;v=_ETkChIsmIyzgs<~vn5C+Va+IXb30>9`s@2ZrnTJ39L7
zxR*MmI~O=vyJkC;IZfwvVk|Z>Lf2`EqB9axr!iEgHoDFX7i2pV5ju0BcIrcP3grT=
z2zPW0hr705`U7W13C?2YGO*k7rZc)QmKc`;m7#hH#e!6X1(h&QP3Li9ED<&WYD{!=
dOoW?n>M~v5l~IDr#JLD;fwA-UKv%}5N&p_TUW5Pu
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 1fa0a9dc84..5ac5fafe9c 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -3193,6 +3193,11 @@ a.label:hover {
text-decoration: none;
cursor: pointer; }
+.label-pill {
+ padding-left: .6em;
+ padding-right: .6em;
+ border-radius: 1rem; }
+
.label-default {
background-color: #818a91; }
.label-default[href]:focus,
diff --git a/dist/css/bootstrap.css.map b/dist/css/bootstrap.css.map
index a746096698a035a1c0da099072e251e0df98a0ba..aaa1ccd9d50a228e36a44b55778daf35a51ddbbf 100644
GIT binary patch
delta 397
zcmdn~maXd@Tf-K{?G|dqPDwi9j*j6v&W?`G)~=4uVLFkHj*&X9j*hN6o{o;*AhEpZ
zA8Z)Ky%QZB6A=<R?v5TI*49A1Njk}nj>%9H@||*Al62CY939i0bX<*{1H*Ov9Uc93
z+)JGdoC}<+U9+9CoFk@hv}RPE&Tq-+FI?!1roY5xdZ8twI5$jr5wddAN_6FhDApw+
ztTTgJSB0!!$PB0-$;0_hmecoHF-mZzyOe<)XFmPD6=R8MCeTz=U%4XtDivW(t_##x
mE-1bN>Ia7xBwX{IN?fP&+AvCR6}uFH?J08Eu5ZKGQ3U|DYID~B
delta 329
zcmeBr$F}_~Tf-K{?H0nNPDwh+j*iJX&W?`G)~@+Z70%OTEg8kR(wz&OtX;F6%ABU#
zSuz%z7@;dPbxzVrcXD)0chYe+c8(0!@pp9e*Ksd(g6TAd>eNQpnc;%0GZCRP7iy<I
zM5j<L(28(J$8fmg3Z@HMGfHq5JC}jomggKaJ=U60dHMz`MwaQ(){Nf9r9dsH{z0)U
z6=7K=%!AWyEg4IMjer^x9UT+lcA2_NPp|=6X5w4~w#?W$Z2B4-sAbz%*)S$l0RXXj
BU^)N*
diff --git a/docs/components/label.md b/docs/components/label.md
index e3c03bb93c..e5937fcd6e 100644
--- a/docs/components/label.md
+++ b/docs/components/label.md
@@ -30,3 +30,16 @@ Add any of the below mentioned modifier classes to change the appearance of a la
<span class="label label-warning">Warning</span>
<span class="label label-danger">Danger</span>
{% endexample %}
+
+### Pill labels
+
+Use the `.label-pill` modifier class to increase the rounded corners. Useful if you miss the badges from v3.
+
+{% example html %}
+<span class="label label-pill label-default">Default</span>
+<span class="label label-pill label-primary">Primary</span>
+<span class="label label-pill label-success">Success</span>
+<span class="label label-pill label-info">Info</span>
+<span class="label label-pill label-warning">Warning</span>
+<span class="label label-pill label-danger">Danger</span>
+{% endexample %}
diff --git a/scss/_labels.scss b/scss/_labels.scss
index ae6ded5b2d..d6dff7738e 100644
--- a/scss/_labels.scss
+++ b/scss/_labels.scss
@@ -36,6 +36,16 @@ a.label {
}
}
+// Pill labels
+//
+// Make them extra rounded with a modifier to replace v3's badges.
+
+.label-pill {
+ padding-left: .6em;
+ padding-right: .6em;
+ border-radius: 1rem;
+}
+
// Colors
//
--
GitLab