From: Mark Otto Date: Fri, 19 Jun 2015 07:14:36 +0000 (-0700) Subject: fix scss linting X-Git-Tag: v4.0.0-alpha~172 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eaa67a82d3a5b63e959feb153a79a82c1aeefbf2;p=thirdparty%2Fbootstrap.git fix scss linting --- diff --git a/scss/_badge.scss b/scss/_badge.scss index 5646da7225..e842cea304 100644 --- a/scss/_badge.scss +++ b/scss/_badge.scss @@ -11,11 +11,11 @@ padding-left: .6em; font-size: .75em; font-weight: $badge-font-weight; - color: $badge-color; line-height: $line-height-base; + color: $badge-color; text-align: center; - vertical-align: middle; white-space: nowrap; + vertical-align: middle; background-color: $badge-bg; @include border-radius($badge-border-radius); diff --git a/scss/_card.scss b/scss/_card.scss index 8809ec5c54..b0bac74e10 100644 --- a/scss/_card.scss +++ b/scss/_card.scss @@ -198,8 +198,8 @@ $card-cap-bg: #f5f5f5; .card { flex: 1 0 0; - margin-left: .625rem; margin-right: .625rem; + margin-left: .625rem; } } } @else { diff --git a/scss/_carousel.scss b/scss/_carousel.scss index 39a779f857..8eb4cdd267 100644 --- a/scss/_carousel.scss +++ b/scss/_carousel.scss @@ -128,7 +128,6 @@ .icon-next { position: absolute; top: 50%; - margin-top: -10px; z-index: 5; display: inline-block; width: 20px; diff --git a/scss/_forms.scss b/scss/_forms.scss index e3959d7d4a..7cdf541258 100644 --- a/scss/_forms.scss +++ b/scss/_forms.scss @@ -35,8 +35,8 @@ // Unstyle the caret on `