This commit is contained in:
Kevin Ross 2016-04-01 10:24:15 -04:00
parent a2cd4c2a08
commit a6aeb33fb1
5 changed files with 5 additions and 9 deletions

View File

@ -1621,6 +1621,7 @@ output {
}
.label {
border-radius: 1px;
padding: .3em .6em;
}
.label,
.label.label-default {
@ -1847,7 +1848,6 @@ label {
label.control-label {
font-size: 12px;
line-height: 1.07142857;
color: #BDBDBD;
font-weight: 400;
margin: 16px 0 0 0;
}
@ -1891,7 +1891,6 @@ label.control-label {
.form-group label.control-label {
font-size: 12px;
line-height: 1.07142857;
color: #BDBDBD;
font-weight: 400;
margin: 16px 0 0 0;
}
@ -1955,7 +1954,6 @@ label.control-label {
.form-group.form-group-sm label.control-label {
font-size: 9px;
line-height: 1.125;
color: #BDBDBD;
font-weight: 400;
margin: 16px 0 0 0;
}
@ -2019,7 +2017,6 @@ label.control-label {
.form-group.form-group-lg label.control-label {
font-size: 14px;
line-height: 0.99999998;
color: #BDBDBD;
font-weight: 400;
margin: 16px 0 0 0;
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -6,6 +6,7 @@
.label {
border-radius: $border-radius-small;
@include variations(unquote(".label"), unquote(""), 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
@ -47,7 +48,6 @@
label.control-label {
font-size: $static-font-size;
line-height: $static-line-height;
color: $mdb-input-placeholder-color;
font-weight: 400;
margin: 16px 0 0 0; // std and lg
}
@ -352,4 +352,3 @@ select.form-control {
height: 100%;
z-index: 100;
}