aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2015-06-19 00:14:36 -0700
committerMark Otto <[email protected]>2015-06-19 00:14:36 -0700
commiteaa67a82d3a5b63e959feb153a79a82c1aeefbf2 (patch)
tree6dc969e73c26667b98fc08630d671ec11563f9e2
parent930ed8df32470bcf98c890bc164285d077fbd4e5 (diff)
downloadbootstrap-eaa67a82d3a5b63e959feb153a79a82c1aeefbf2.tar.xz
bootstrap-eaa67a82d3a5b63e959feb153a79a82c1aeefbf2.zip
fix scss linting
-rw-r--r--scss/_badge.scss4
-rw-r--r--scss/_card.scss2
-rw-r--r--scss/_carousel.scss1
-rw-r--r--scss/_forms.scss2
4 files changed, 4 insertions, 5 deletions
diff --git a/scss/_badge.scss b/scss/_badge.scss
index 5646da722..e842cea30 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 8809ec5c5..b0bac74e1 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 39a779f85..8eb4cdd26 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 e3959d7d4..7cdf54125 100644
--- a/scss/_forms.scss
+++ b/scss/_forms.scss
@@ -35,8 +35,8 @@
// Unstyle the caret on `<select>`s in IE10+.
&::-ms-expand {
- border: 0;
background-color: transparent;
+ border: 0;
}
// Customize the `:focus` state to imitate native WebKit styles.