Merge pull request #946 from HeliumSquid/master

Fixed label padding error in upstream bootstrap which will not be fixed.
This commit is contained in:
Kevin Ross 2016-03-28 11:15:52 -05:00
commit 5624d2d324

View File

@ -4,6 +4,7 @@
.label { .label {
border-radius: @border-radius-small; border-radius: @border-radius-small;
.variations(~".label", ~"", background-color, @grey); .variations(~".label", ~"", background-color, @grey);
padding: .3em .6em; // Make top & bottom .label padding the same: https://github.com/twbs/bootstrap/pull/19631
} }
// must be broken out for reuse - webkit selector breaks firefox // must be broken out for reuse - webkit selector breaks firefox
@ -347,4 +348,3 @@ select.form-control {
height: 100%; height: 100%;
z-index: 100; z-index: 100;
} }