fix new stylelint nits

streetmix · Nov 28, 2017 · 941e940 · 941e940
1 parent 869e82b
commit 941e940
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 23 deletions.
diff --git a/.stylelintrc b/.stylelintrc
@@ -8,6 +8,7 @@
     "scss/at-mixin-argumentless-call-parentheses": "never",
     "scss/selector-no-redundant-nesting-selector": true,
     "at-rule-no-unknown": null,
-    "scss/at-rule-no-unknown": true
+    "scss/at-rule-no-unknown": true,
+    "no-descending-specificity": null
   }
 }
diff --git a/assets/css/_base.scss b/assets/css/_base.scss
@@ -77,4 +77,3 @@ textarea {
     border-color: desaturate($ui-colour, 100%) !important;
   }
 }
-
diff --git a/assets/css/_info-bubble.scss b/assets/css/_info-bubble.scss
@@ -81,9 +81,21 @@
     fill: #231f20;
   }
 
-  button.remove {
-    padding: 0;
-    margin-top: -3px;
+  button {
+    width: $info-bubble-button-size;
+    height: $info-bubble-button-size;
+
+    &.remove {
+      position: absolute;
+      right: 6px;
+      top: 6px;
+      width: auto;
+      padding: 0;
+      padding-left: 10px;
+      padding-right: 10px;
+      margin-top: -3px;
+      font-size: 11px;
+    }
   }
 
   &[type='segment'] .variants {
@@ -248,21 +260,6 @@
       margin-top: 7px;
     }
   }
-
-  button {
-    width: $info-bubble-button-size;
-    height: $info-bubble-button-size;
-
-    &.remove {
-      position: absolute;
-      right: 6px;
-      top: 6px;
-      width: auto;
-      padding-left: 10px;
-      padding-right: 10px;
-      font-size: 11px;
-    }
-  }
 }
 
 .info-bubble.highlight-triangle .triangle::before {

diff --git a/assets/css/_menu-bar.scss b/assets/css/_menu-bar.scss
@@ -93,7 +93,7 @@ $top-menu-active-text: darken($ui-colour, 40%);
       content: ' ▼';
       display: inline-block;
       padding-left: 5px;
-      font-family: 'Verdana';
+      font-family: 'Verdana', sans-serif;
       font-size: 9px;
       transform: scaleY(0.75);
     }

diff --git a/assets/css/_segment.scss b/assets/css/_segment.scss
@@ -157,7 +157,7 @@ body.segment-resize-dragging * {
   border-bottom: 3px solid darken($ui-colour, 30%);
   line-height: 100px;
   font-size: 50px;
-  font-family: 'Tahoma';
+  font-family: 'Tahoma', sans-serif;
   color: lighten($ui-colour, 0%);
   z-index: $z-06-drag-handle;
   pointer-events: none;

diff --git a/assets/css/_street-metadata.scss b/assets/css/_street-metadata.scss
@@ -28,7 +28,7 @@ body:not(.read-only) #street-width-read {
   }
 
   &::after {
-    font-family: 'Verdana';
+    font-family: 'Verdana', sans-serif;
     content: ' ▼';
     padding-left: 5px;
     font-size: 9px;