From 10e76d7764cedb5e9ac076acfc891de7b5772920 Mon Sep 17 00:00:00 2001
From: Nico Van den Winckel <nico.vandenwinckel@retailsonar.com>
Date: Fri, 10 Mar 2017 12:11:18 +0100
Subject: [PATCH] Fixed some linting issues

---
 scss/mixins/_border-radius.scss |  6 +++---
 scss/mixins/_clearfix.scss      |  2 +-
 scss/mixins/_forms.scss         |  2 +-
 scss/mixins/_hover.scss         | 11 ++++-------
 scss/mixins/_reset-text.scss    |  2 ++
 scss/mixins/_text-truncate.scss |  2 +-
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/scss/mixins/_border-radius.scss b/scss/mixins/_border-radius.scss
index 54f29f41da..2024febcfa 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 b72cf27128..11a977b737 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 9fde3a8a6f..33b186a8de 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 6dd55e705a..3972966623 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 b952730977..9bbd07562b 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 5a40bf533a..3504bb1aa5 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
+}
-- 
GitLab