diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss index 54f29f41da40170873dca54b089a60a41e123f98..2024febcfa82ffa56efb6a3c26255613da03d211 100644 --- a/scss/mixins/_border-radius.scss +++ b/scss/mixins/_border-radius.scss @@ -8,15 +8,15 @@ @mixin border-top-radius($radius) { @if $enable-rounded { - border-top-right-radius: $radius; border-top-left-radius: $radius; + border-top-right-radius: $radius; } } @mixin border-right-radius($radius) { @if $enable-rounded { - border-bottom-right-radius: $radius; border-top-right-radius: $radius; + border-bottom-right-radius: $radius; } } @@ -29,7 +29,7 @@ @mixin border-left-radius($radius) { @if $enable-rounded { - border-bottom-left-radius: $radius; border-top-left-radius: $radius; + border-bottom-left-radius: $radius; } } diff --git a/scss/mixins/_clearfix.scss b/scss/mixins/_clearfix.scss index b72cf27128aaf88939ffdc18d1a8ab643b3c8f3f..11a977b7373dab15046354e1b27b88f29acdf44f 100644 --- a/scss/mixins/_clearfix.scss +++ b/scss/mixins/_clearfix.scss @@ -1,7 +1,7 @@ @mixin clearfix() { &::after { display: block; - content: ""; clear: both; + content: ""; } } diff --git a/scss/mixins/_forms.scss b/scss/mixins/_forms.scss index 9fde3a8a6f409b30c85c36ecb0d49d025dded2a1..33b186a8de0cdab7a70240b3568b02a89dfbf497 100644 --- a/scss/mixins/_forms.scss +++ b/scss/mixins/_forms.scss @@ -27,8 +27,8 @@ // Set validation states also for addons .input-group-addon { color: $color; - border-color: $color; background-color: lighten($color, 40%); + border-color: $color; } } diff --git a/scss/mixins/_hover.scss b/scss/mixins/_hover.scss index 6dd55e705a6e177d1c62c4dcdf02d2d61f33d54a..3972966623d0e480b98467e27aa22b09c391a2c0 100644 --- a/scss/mixins/_hover.scss +++ b/scss/mixins/_hover.scss @@ -8,7 +8,7 @@ // } // } // @else { - &:hover { @content } + &:hover { @content } // } } @@ -16,8 +16,7 @@ @if $enable-hover-media-query { &:focus { @content } @include hover { @content } - } - @else { + } @else { &:focus, &:hover { @content @@ -32,8 +31,7 @@ @content } @include hover { @content } - } - @else { + } @else { &, &:focus, &:hover { @@ -49,8 +47,7 @@ @content } @include hover { @content } - } - @else { + } @else { &:focus, &:active, &:hover { diff --git a/scss/mixins/_reset-text.scss b/scss/mixins/_reset-text.scss index b952730977bde7abbfc2b33eb07abf63d6456d50..9bbd07562b44fdabefc1c076c7709e5b8f1f7bfb 100644 --- a/scss/mixins/_reset-text.scss +++ b/scss/mixins/_reset-text.scss @@ -7,7 +7,9 @@ line-break: auto; line-height: $line-height-base; text-align: left; // Fallback for where `start` is not supported + // scss-lint:disable DuplicateProperty text-align: start; + // scss-lint:enable DuplicateProperty text-decoration: none; text-shadow: none; text-transform: none; diff --git a/scss/mixins/_text-truncate.scss b/scss/mixins/_text-truncate.scss index 5a40bf533a9281f5ef015fdadc4a98ce169d9c2e..3504bb1aa5d7aa2c3d75aedd4a03916afaa7e4d9 100644 --- a/scss/mixins/_text-truncate.scss +++ b/scss/mixins/_text-truncate.scss @@ -5,4 +5,4 @@ overflow: hidden; text-overflow: ellipsis; white-space: nowrap; -} \ No newline at end of file +}