From 41a96ebad21035e3a9641e9dd478a6f72397011d Mon Sep 17 00:00:00 2001
From: Ashley Harrison <ashley.harrison@grafana.com>
Date: Wed, 23 Mar 2022 11:59:11 +0000
Subject: [PATCH] remove old rule that wasn't working properly

---
 public/sass/base/_code.scss          | 2 +-
 public/sass/components/_gf-form.scss | 8 ++++----
 public/sass/components/_switch.scss  | 8 ++++----
 stylelint.config.js                  | 8 --------
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/public/sass/base/_code.scss b/public/sass/base/_code.scss
index 92a34ebbede..2d2871a0b2a 100644
--- a/public/sass/base/_code.scss
+++ b/public/sass/base/_code.scss
@@ -41,7 +41,7 @@ pre {
 
   &.pre--no-style {
     background: transparent;
-    border: none;
+    border: 0;
     padding: 0px;
   }
 
diff --git a/public/sass/components/_gf-form.scss b/public/sass/components/_gf-form.scss
index 761d7e070c7..7f42af08135 100644
--- a/public/sass/components/_gf-form.scss
+++ b/public/sass/components/_gf-form.scss
@@ -126,7 +126,7 @@ $input-border: 1px solid $input-border-color;
   margin-right: $space-xs;
   border-radius: $input-border-radius;
   justify-content: space-between;
-  border: none;
+  border: 0;
 
   &--grow {
     flex-grow: 1;
@@ -159,7 +159,7 @@ $input-border: 1px solid $input-border-color;
   }
 
   &--btn {
-    border: none;
+    border: 0;
     border-radius: $border-radius;
 
     &:hover {
@@ -183,7 +183,7 @@ $input-border: 1px solid $input-border-color;
   margin: 0;
   margin-right: $space-xs;
   border: $border-width solid transparent;
-  border-left: none;
+  border-left: 0;
   @include border-radius($input-border-radius);
 }
 
@@ -453,7 +453,7 @@ select.gf-form-input ~ .gf-form-help-icon {
 .cta-form__close {
   background: transparent;
   padding: 4px 8px 4px 9px;
-  border: none;
+  border: 0;
   position: absolute;
   right: 0;
   top: -2px;
diff --git a/public/sass/components/_switch.scss b/public/sass/components/_switch.scss
index c2bc4fd14c3..4461dda488b 100644
--- a/public/sass/components/_switch.scss
+++ b/public/sass/components/_switch.scss
@@ -85,7 +85,7 @@ input:checked + .gf-form-switch__slider::before {
   height: $input-height;
   background: $switch-bg;
   border: 1px solid $input-border-color;
-  border-left: none;
+  border-left: 0;
   border-radius: $input-border-radius;
   align-items: center;
   justify-content: center;
@@ -99,7 +99,7 @@ input:checked + .gf-form-switch__slider::before {
 
   &--transparent {
     background: transparent;
-    border: none;
+    border: 0;
     width: 23px;
     height: auto;
     position: relative;
@@ -110,7 +110,7 @@ input:checked + .gf-form-switch__slider::before {
     width: 20px;
     background: transparent;
     height: auto;
-    border: none;
+    border: 0;
     position: relative;
     top: -5px;
   }
@@ -135,5 +135,5 @@ input:checked + .gf-form-switch__checkbox::before {
 
 input:checked + .gf-form-switch__checkbox {
   background: $checkbox-checked-bg;
-  border: none;
+  border: 0;
 }
diff --git a/stylelint.config.js b/stylelint.config.js
index ae077001dcd..fca50bbb7d1 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -13,14 +13,6 @@ module.exports = {
         ignoreProperties: ['font-size', 'word-break'],
       },
     ],
-    // Disable equivalent "borderZero" sass-lint rule
-    'declaration-property-value-disallowed-list': {
-      border: [0],
-      'border-top': [0],
-      'border-right': [0],
-      'border-bottom': [0],
-      'border-left': [0],
-    },
     'function-comma-space-after': null,
     'function-url-quotes': null,
     'length-zero-no-unit': null,