Fix various CodeClimate warnings

12 files changed, 43 insertions, 25 deletions

diff --git a/app/javascript/flavours/glitch/styles/_mixins.scss b/app/javascript/flavours/glitch/styles/_mixins.scss
index 088b41e76..c92bc8608 100644
--- a/app/javascript/flavours/glitch/styles/_mixins.scss
+++ b/app/javascript/flavours/glitch/styles/_mixins.scss
@@ -55,7 +55,7 @@
   outline: 0;
   box-sizing: border-box;
   width: 100%;
-  border: none;
+  border: 0;
   box-shadow: none;
   font-family: inherit;
   background: $ui-base-color;
diff --git a/app/javascript/flavours/glitch/styles/accessibility.scss b/app/javascript/flavours/glitch/styles/accessibility.scss
index 1a2de2f06..cb27497a4 100644
--- a/app/javascript/flavours/glitch/styles/accessibility.scss
+++ b/app/javascript/flavours/glitch/styles/accessibility.scss
@@ -15,21 +15,21 @@ $emojis-requiring-inversion: 'back' 'copyright' 'curly_loop' 'currency_exchange'
 .hicolor-privacy-icons {
   .status__visibility-icon.fa-globe,
   .composer--options--dropdown--content--item .fa-globe {
-    color: #1976D2;
+    color: #1976d2;
   }
 
   .status__visibility-icon.fa-unlock,
   .composer--options--dropdown--content--item .fa-unlock {
-    color: #388E3C;
+    color: #388e3c;
   }
 
   .status__visibility-icon.fa-lock,
   .composer--options--dropdown--content--item .fa-lock {
-    color: #FFA000;
+    color: #ffa000;
   }
 
   .status__visibility-icon.fa-envelope,
   .composer--options--dropdown--content--item .fa-envelope {
-    color: #D32F2F;
+    color: #d32f2f;
   }
 }
diff --git a/app/javascript/flavours/glitch/styles/admin.scss b/app/javascript/flavours/glitch/styles/admin.scss
index 3cf5ee970..4801a4644 100644
--- a/app/javascript/flavours/glitch/styles/admin.scss
+++ b/app/javascript/flavours/glitch/styles/admin.scss
@@ -267,7 +267,7 @@ $content-width: 840px;
       text-transform: none;
       padding-bottom: 0;
       margin-bottom: 0;
-      border-bottom: none;
+      border-bottom: 0;
     }
 
     & > p {
diff --git a/app/javascript/flavours/glitch/styles/components/accounts.scss b/app/javascript/flavours/glitch/styles/components/accounts.scss
index c0bbe5633..6dcfbcb02 100644
--- a/app/javascript/flavours/glitch/styles/components/accounts.scss
+++ b/app/javascript/flavours/glitch/styles/components/accounts.scss
@@ -14,7 +14,7 @@
   }
 
   &.small {
-    border: none;
+    border: 0;
     padding: 0;
 
     & > .account__avatar-wrapper { margin: 0 8px 0 0 }
@@ -278,7 +278,7 @@
 }
 
 .account-gallery__item {
-  border: none;
+  border: 0;
   box-sizing: border-box;
   display: block;
   position: relative;
diff --git a/app/javascript/flavours/glitch/styles/components/columns.scss b/app/javascript/flavours/glitch/styles/components/columns.scss
index 2d080d3b9..90aa5859d 100644
--- a/app/javascript/flavours/glitch/styles/components/columns.scss
+++ b/app/javascript/flavours/glitch/styles/components/columns.scss
@@ -264,7 +264,7 @@
 
   & > button {
     margin: 0;
-    border: none;
+    border: 0;
     padding: 15px;
     color: inherit;
     background: transparent;
diff --git a/app/javascript/flavours/glitch/styles/components/composer.scss b/app/javascript/flavours/glitch/styles/components/composer.scss
index 460f75c1f..fd62bb651 100644
--- a/app/javascript/flavours/glitch/styles/components/composer.scss
+++ b/app/javascript/flavours/glitch/styles/components/composer.scss
@@ -44,7 +44,7 @@
     display: block;
     box-sizing: border-box;
     margin: 0;
-    border: none;
+    border: 0;
     border-radius: 4px;
     padding: 10px;
     width: 100%;
@@ -81,7 +81,9 @@
 
     &:active,
     &:focus,
-    &:hover { text-decoration: none }
+    &:hover {
+      text-decoration: none;
+    }
   }
 }
 
@@ -256,7 +258,7 @@
       display: block;
       box-sizing: border-box;
       margin: 0;
-      border: none;
+      border: 0;
       border-radius: 4px 4px 0 0;
       padding: 10px 32px 0 10px;
       width: 100%;
@@ -277,9 +279,17 @@
         all: unset;
       }
 
-      &:disabled { background: $ui-secondary-color }
-      &:focus { outline: 0 }
-      @include single-column('screen and (max-width: 630px)') { font-size: 16px }
+      &:disabled {
+        background: $ui-secondary-color;
+      }
+
+      &:focus {
+        outline: 0;
+      }
+
+      @include single-column('screen and (max-width: 630px)') {
+        font-size: 16px;
+      }
 
       @include limited-single-column('screen and (max-width: 600px)') {
         height: 100px !important; // prevent auto-resize textarea
diff --git a/app/javascript/flavours/glitch/styles/components/drawer.scss b/app/javascript/flavours/glitch/styles/components/drawer.scss
index fa410234a..b6d06f53a 100644
--- a/app/javascript/flavours/glitch/styles/components/drawer.scss
+++ b/app/javascript/flavours/glitch/styles/components/drawer.scss
@@ -15,10 +15,16 @@
     padding-right: 10px;
   }
 
-  @include single-column('screen and (max-width: 630px)') { flex: auto }
+  @include single-column('screen and (max-width: 630px)') {
+    flex: auto;
+  }
 
   @include limited-single-column('screen and (max-width: 630px)') {
-    &, &:first-child, &:last-child { padding: 0 }
+    &,
+    &:first-child,
+    &:last-child {
+      padding: 0;
+    }
   }
 
   .wide & {
@@ -230,7 +236,7 @@
     display: block;
     width: 100%;
     height: 100%;
-    border: none;
+    border: 0;
     cursor: inherit;
   }
 
diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss
index 40206c696..aada9a928 100644
--- a/app/javascript/flavours/glitch/styles/components/index.scss
+++ b/app/javascript/flavours/glitch/styles/components/index.scss
@@ -1038,7 +1038,7 @@
 .setting-text {
   color: $darker-text-color;
   background: transparent;
-  border: none;
+  border: 0;
   border-bottom: 2px solid $ui-primary-color;
   box-sizing: border-box;
   display: block;
diff --git a/app/javascript/flavours/glitch/styles/components/media.scss b/app/javascript/flavours/glitch/styles/components/media.scss
index f504fa91e..6cbcb05bd 100644
--- a/app/javascript/flavours/glitch/styles/components/media.scss
+++ b/app/javascript/flavours/glitch/styles/components/media.scss
@@ -82,7 +82,7 @@
 }
 
 .media-gallery__item {
-  border: none;
+  border: 0;
   box-sizing: border-box;
   display: block;
   float: left;
diff --git a/app/javascript/flavours/glitch/styles/components/modal.scss b/app/javascript/flavours/glitch/styles/components/modal.scss
index 0bda305a8..f5acd814e 100644
--- a/app/javascript/flavours/glitch/styles/components/modal.scss
+++ b/app/javascript/flavours/glitch/styles/components/modal.scss
@@ -876,7 +876,7 @@
       box-sizing: border-box;
       display: block;
       width: 100%;
-      border: none;
+      border: 0;
       padding: 10px;
       font-family: 'mastodon-font-monospace', monospace;
       background: $ui-base-color;
diff --git a/app/javascript/flavours/glitch/styles/components/status.scss b/app/javascript/flavours/glitch/styles/components/status.scss
index d6fbfbaa4..4248657ad 100644
--- a/app/javascript/flavours/glitch/styles/components/status.scss
+++ b/app/javascript/flavours/glitch/styles/components/status.scss
@@ -209,7 +209,7 @@
   display: inline-block;
   border-radius: 2px;
   background: lighten($ui-base-color, 30%);
-  border: none;
+  border: 0;
   color: $inverted-text-color;
   font-weight: 500;
   font-size: 11px;
@@ -389,8 +389,10 @@
       &:after {
         content: "";
         position: absolute;
-        top: 0; bottom: 0;
-        left: 0; right: 0;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
         background: linear-gradient(rgba($ui-base-color, 0), rgba($ui-base-color, 1));
         pointer-events: none;
       }
diff --git a/app/javascript/flavours/glitch/styles/forms.scss b/app/javascript/flavours/glitch/styles/forms.scss
index 8ea507333..a65ef4454 100644
--- a/app/javascript/flavours/glitch/styles/forms.scss
+++ b/app/javascript/flavours/glitch/styles/forms.scss
@@ -625,7 +625,7 @@ code {
     box-sizing: border-box;
     display: block;
     width: 100%;
-    border: none;
+    border: 0;
     padding: 10px;
     font-family: $font-monospace, monospace;
     background: $ui-base-color;