style(scss): Rearrange the stylint extends so that CSS modules comes …

…second. This ensures that is works correctly to ignore the composes without writing our own rules.
telus · Sep 20, 2017 · bc081eb · bc081eb
1 parent ec3345e
commit bc081eb
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 22 deletions.
diff --git a/config/.stylelintrc.json b/config/.stylelintrc.json
@@ -1,7 +1,7 @@
 {
   "extends": [
-    "stylelint-config-css-modules",
-    "stylelint-config-standard"
+    "stylelint-config-standard",
+    "stylelint-config-css-modules"
   ],
   "plugins": [
     "stylelint-scss"
@@ -15,25 +15,6 @@
           "include"
         ]
       }
-    ],
-    "declaration-block-no-duplicate-properties": [
-      true,
-      {
-        "ignoreProperties": [
-          "composes"
-        ]
-      }
-    ],
-    "property-no-unknown": [
-      true,
-      {
-        "ignoreProperties": [
-          "composes"
-        ]
-      }
-    ],
-    "declaration-empty-line-before": [
-      "never"
     ]
   }
 }
diff --git a/src/components/Button/Button.modules.scss b/src/components/Button/Button.modules.scss
@@ -45,6 +45,7 @@ $button-text-color: $color-white;
 
   &:hover {
     @include border;
+
     color: $button-text-color;
   }
 }
@@ -56,6 +57,7 @@ $button-text-color: $color-white;
 
   &:hover {
     @include border;
+
     background-color: $button-text-color;
     color: $primary-bg-color;
   }
@@ -68,6 +70,7 @@ $button-text-color: $color-white;
 
   &:hover {
     @include border;
+
     background-color: $button-text-color;
     color: $secondary-bg-color;
   }
@@ -87,6 +90,7 @@ $button-text-color: $color-white;
   composes: button;
 
   @include border;
+
   background-color: transparent;
   color: $button-text-color;
 
@@ -103,6 +107,7 @@ $button-text-color: $color-white;
 
   &:hover {
     @include border;
+
     background-color: transparent;
   }
 }
@@ -114,6 +119,7 @@ $button-text-color: $color-white;
 
   &:hover {
     @include border;
+
     background-color: transparent;
     color: $button-text-color;
   }

diff --git a/src/components/Input/Input.modules.scss b/src/components/Input/Input.modules.scss
@@ -77,6 +77,7 @@ input.input {
   line-height: 1.5;
 
   @include helvetica-neue-light-45;
+
   color: $color-shark;
   background-color: transparent;
 

diff --git a/src/components/Link/ChevronLink/ChevronLink.modules.scss b/src/components/Link/ChevronLink/ChevronLink.modules.scss
@@ -2,9 +2,10 @@
 @import '../../../scss/settings/typography';
 
 .link {
-  @include helvetica-neue-roman-55;
   composes: medium from '../../Typography/Text/Text.modules.scss';
 
+  @include helvetica-neue-roman-55;
+
   &:hover {
     .rightChevron {
       transform: translateX(0.25rem);

diff --git a/src/components/Typography/DisplayHeading/DisplayHeading.modules.scss b/src/components/Typography/DisplayHeading/DisplayHeading.modules.scss
@@ -15,6 +15,7 @@
   composes: noSpacing from '../../Spacing/Spacing.modules.scss';
 
   @include helvetica-neue-thin-35;
+
   font-size: 2.75rem;
   line-height: 1.14; // 48px
 

diff --git a/src/components/Typography/Heading/Heading.modules.scss b/src/components/Typography/Heading/Heading.modules.scss
@@ -21,6 +21,7 @@
   composes: noSpacing from '../../Spacing/Spacing.modules.scss';
 
   @include helvetica-neue-medium-65;
+
   letter-spacing: -0.6px;
 }