chore(lint): fix more linting errors

carbon-design-system · Jul 7, 2020 · 87ab11c · 87ab11c
1 parent 6237331
commit 87ab11c
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 32 deletions.
diff --git a/packages/components/src/components/data-table/_data-table-core.scss b/packages/components/src/components/data-table/_data-table-core.scss
@@ -218,10 +218,6 @@
   .#{$prefix}--data-table--short td.#{$prefix}--table-column-menu {
     padding-top: 0;
     padding-bottom: 0;
-  }
-
-  .#{$prefix}--data-table--compact td.#{$prefix}--table-column-menu,
-  .#{$prefix}--data-table--short td.#{$prefix}--table-column-menu {
     height: rem(24px);
   }
 

diff --git a/packages/components/src/components/data-table/_data-table-sort.scss b/packages/components/src/components/data-table/_data-table-sort.scss
@@ -27,6 +27,7 @@
   // -------------------------------------
   .#{$prefix}--table-sort {
     @include button-reset(false);
+
     font: inherit;
     line-height: 1;
     display: flex;

diff --git a/packages/components/src/components/pagination/_unstable_pagination.scss b/packages/components/src/components/pagination/_unstable_pagination.scss
@@ -22,6 +22,7 @@ $css--helpers: true;
   .#{$prefix}--unstable-pagination {
     @include reset;
     @include carbon--type-style('body-short-01');
+
     width: 100%;
     background-color: $ui-01;
     display: flex;
@@ -70,6 +71,7 @@ $css--helpers: true;
 
   .#{$prefix}--unstable-pagination__button {
     @include reset;
+
     border: none;
     border-left: 1px solid $ui-03;
     background: none;
@@ -80,16 +82,16 @@ $css--helpers: true;
     display: flex;
     justify-content: center;
     align-items: center;
-    color: $ui-05; // for currentColor
+    color: $ui-05;
     fill: $ui-05;
-    transition: outline $duration--fast-02 motion(standard, productive);
-    transition: background-color $duration--fast-02 motion(standard, productive);
+    transition: outline $duration--fast-02 motion(standard, productive),
+      background-color $duration--fast-02 motion(standard, productive);
   }
 
   // Unset height/width set by icon-only button:
   .#{$prefix}--unstable-pagination__button .#{$prefix}--btn__icon {
-    height: unset;
-    width: unset;
+    height: initial;
+    width: initial;
   }
 
   .#{$prefix}--unstable-pagination__button.#{$prefix}--btn--icon-only.#{$prefix}--tooltip__trigger:focus {
@@ -135,6 +137,7 @@ $css--helpers: true;
   .#{$prefix}--unstable-pagination__page-selector .#{$prefix}--select-input,
   .#{$prefix}--unstable-pagination__page-sizer .#{$prefix}--select-input {
     @include carbon--type-style('body-short-01');
+
     width: auto;
     min-width: auto;
     height: 100%;

diff --git a/packages/components/src/components/ui-shell/_theme.scss b/packages/components/src/components/ui-shell/_theme.scss
@@ -20,11 +20,7 @@ $shell-header-bg-01: $carbon--gray-100;
 /// @type Color
 /// @access private
 /// @group ui-shell
-<<<<<<< HEAD
 /// TODO needs color var gray-100-hover
-=======
-//TODO needs color var gray-100-hover
->>>>>>> chore(lint): clear rest of stylelint errors
 $shell-header-bg-02: #2c2c2c;
 
 /// Header action active background
@@ -37,11 +33,7 @@ $shell-header-bg-03: $carbon--gray-80;
 /// @type Color
 /// @access private
 /// @group ui-shell
-<<<<<<< HEAD
 /// TODO needs color var gray-90-hover
-=======
-//TODO needs color var gray-90-hover
->>>>>>> chore(lint): clear rest of stylelint errors
 $shell-header-bg-04: #353535;
 
 /// Header nav link active and focus background
@@ -118,11 +110,7 @@ $shell-panel-bg-01: $carbon--gray-100;
 /// @type Color
 /// @access private
 /// @group ui-shell
-<<<<<<< HEAD
 /// TODO needs color var gray-100-hover
-=======
-//TODO needs color var gray-100-hover
->>>>>>> chore(lint): clear rest of stylelint errors
 $shell-panel-bg-02: #2c2c2c;
 
 /// Panel item focus and active background

diff --git a/packages/components/src/globals/scss/_css--body.scss b/packages/components/src/globals/scss/_css--body.scss
@@ -17,6 +17,7 @@
   body {
     @include reset;
     @include type-style('body-short-01');
+
     color: $text-01;
     background-color: $ui-background;
     line-height: 1;

diff --git a/packages/components/src/globals/scss/_css--helpers.scss b/packages/components/src/globals/scss/_css--helpers.scss
@@ -31,6 +31,7 @@
   .#{$prefix}--body {
     @include reset;
     @include type-style('body-short-01');
+
     color: $text-01;
     background-color: $ui-background;
     line-height: 1;

diff --git a/packages/components/src/globals/scss/_css--reset.scss b/packages/components/src/globals/scss/_css--reset.scss
@@ -23,8 +23,8 @@
     vertical-align: baseline;
 
     *,
-    *:before,
-    *:after {
+    *::before,
+    *::after {
       box-sizing: inherit;
     }
   }
@@ -117,8 +117,8 @@
       margin: 0;
       padding: 0;
       border: 0;
-      font-size: 100%;
       font: inherit;
+      font-size: 100%;
       vertical-align: baseline;
     }
 
@@ -173,12 +173,11 @@
       quotes: none;
     }
 
-    blockquote:before,
-    blockquote:after,
-    q:before,
-    q:after {
+    blockquote::before,
+    blockquote::after,
+    q::before,
+    q::after {
       content: '';
-      content: none;
     }
 
     table {

diff --git a/packages/components/src/globals/scss/_helper-mixins.scss b/packages/components/src/globals/scss/_helper-mixins.scss
@@ -129,6 +129,7 @@
 /// @group global-helpers
 @mixin button-reset($width: true) {
   @include reset;
+
   display: inline-block;
   background: none;
   appearance: none;
@@ -165,7 +166,7 @@
     cursor: default;
   }
 
-  &:before {
+  &::before {
     content: '';
     width: 0%;
     height: 100%;

diff --git a/packages/components/src/globals/scss/_tooltip.scss b/packages/components/src/globals/scss/_tooltip.scss
@@ -272,8 +272,6 @@
   // @todo Simplify CSS selectors on next major release
   &::after,
   .#{$prefix}--assistive-text,
-  .#{$prefix}--assistive-text,
-  + .#{$prefix}--assistive-text,
   + .#{$prefix}--assistive-text {
     @if ($position == 'top') {
       top: -$body-spacing;