Bump some deps, fix stylelint issues (#960)

emberjs · Apr 23, 2019 · c1a3928 · c1a3928
1 parent 8fe181d
commit c1a3928
Show file tree

Hide file tree

Showing 5 changed files with 221 additions and 843 deletions.
diff --git a/app/styles/component_tree.scss b/app/styles/component_tree.scss
@@ -9,22 +9,6 @@
   position: relative;
 }
 
-.component-tree-item--component {
-  color: var(--component-text);
-
-  &:hover {
-    background-color: var(--spec06);
-
-    .component-tree-item__action {
-      opacity: 1;
-    }
-
-    .component-tree-item__action.disabled {
-      opacity: 0.65;
-    }
-  }
-}
-
 .component-tree-item__action {
   align-items: center;
   background: transparent;
@@ -102,3 +86,19 @@
     opacity: 0.65;
   }
 }
+
+.component-tree-item--component {
+  color: var(--component-text);
+
+  &:hover {
+    background-color: var(--spec06);
+
+    .component-tree-item__action {
+      opacity: 1;
+    }
+
+    .component-tree-item__action.disabled {
+      opacity: 0.65;
+    }
+  }
+}
diff --git a/app/styles/ember-table.scss b/app/styles/ember-table.scss
@@ -35,10 +35,6 @@ $red: #ff2717;
     background: var(--base02);
   }
 
-  .striped td {
-    background-color: var(--base00);
-  }
-
   td,
   .et-cell-content {
     box-sizing: border-box;
@@ -50,6 +46,10 @@ $red: #ff2717;
     white-space: nowrap;
   }
 
+  .striped td {
+    background-color: var(--base00);
+  }
+
   .blue {
     color: $blue;
   }
@@ -162,17 +162,21 @@ $red: #ff2717;
     flex: 1;
   }
 
-  tr.is-selected td,
-  tr.is-selected.is-selectable:hover td {
-    background: var(--focus);
-    color: var(--focus-text);
-  }
-
   tr.is-selectable {
     cursor: pointer;
   }
 
+  tr.is-selected td {
+    background: var(--focus);
+    color: var(--focus-text);
+  }
+
   tr.is-selectable:hover td {
     background: var(--base04);
   }
+
+  tr.is-selected.is-selectable:hover td {
+    background: var(--focus);
+    color: var(--focus-text);
+  }
 }
diff --git a/app/styles/mixin.scss b/app/styles/mixin.scss
@@ -32,10 +32,6 @@ $mixin-left-padding: 22px;
   color: var(--base09);
 }
 
-.mixin_props_no .mixin__name:before {
-  opacity: 0;
-}
-
 .mixin__name:before {
   color: var(--base10);
   content: "\25B6";
@@ -48,6 +44,10 @@ $mixin-left-padding: 22px;
   transition: all 0.1s;
 }
 
+.mixin_props_no .mixin__name:before {
+  opacity: 0;
+}
+
 .mixin_state_expanded .mixin__name:before {
   transform: rotate(90deg);
 }
@@ -73,6 +73,31 @@ $mixin-left-padding: 22px;
   text-overflow: ellipsis;
   white-space: nowrap;
 
+  button {
+    background: none;
+    border: none;
+    margin: 0;
+    padding: 0;
+  }
+
+  .pad {
+    flex-shrink: 0;
+    width: $mixin-left-padding;
+  }
+
+  .mixin__calc-btn svg {
+    path,
+    circle {
+      fill: var(--spec07);
+    }
+  }
+
+  .mixin__send-btn {
+    flex-shrink: 0;
+    opacity: 0;
+    padding-right: 6px;
+  }
+
   .mixin__cp-toggle {
     outline: none;
     width: $mixin-left-padding;
@@ -112,33 +137,6 @@ $mixin-left-padding: 22px;
 
 /* Buttons */
 
-.mixin__property {
-  button {
-    background: none;
-    border: none;
-    margin: 0;
-    padding: 0;
-  }
-
-  .pad {
-    flex-shrink: 0;
-    width: $mixin-left-padding;
-  }
-
-  .mixin__calc-btn svg {
-    path,
-    circle {
-      fill: var(--spec07);
-    }
-  }
-
-  .mixin__send-btn {
-    flex-shrink: 0;
-    opacity: 0;
-    padding-right: 6px;
-  }
-}
-
 .mixin__property-overridden-by {
   display: none;
 }

diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "@html-next/vertical-collection": "^1.0.0-beta.13",
     "amd-name-resolver": "^1.2.1",
     "aws-sdk": "^2.383.0",
-    "babel-eslint": "^8.2.6",
+    "babel-eslint": "^10.0.1",
     "babel-plugin-transform-es2015-modules-amd": "^6.24.0",
     "basiccontext": "^3.5.1",
     "broccoli-asset-rev": "^3.0.0",
@@ -44,7 +44,7 @@
     "broccoli-file-creator": "^1.2.0",
     "broccoli-funnel": "^2.0.1",
     "broccoli-merge-trees": "^3.0.2",
-    "broccoli-stew": "^1.6.0",
+    "broccoli-stew": "^2.1.0",
     "broccoli-string-replace": "^0.1.1",
     "compare-versions": "^3.4.0",
     "ember-cli": "~3.10.0-beta.1",
@@ -64,9 +64,9 @@
     "ember-cli-template-lint": "^1.0.0-beta.3",
     "ember-cli-uglify": "^2.1.0",
     "ember-cli-version-checker": "^3.1.3",
-    "ember-concurrency": "^0.9.0",
+    "ember-concurrency": "^0.10.0",
     "ember-export-application-global": "^2.0.0",
-    "ember-fetch": "^6.5.0",
+    "ember-fetch": "^6.5.1",
     "ember-flatpickr": "^2.14.0",
     "ember-load-initializers": "^2.0.0",
     "ember-math-helpers": "^2.11.1",
@@ -92,9 +92,9 @@
     "mkdirp": "^0.5.1",
     "qunit-dom": "^0.8.4",
     "rimraf": "^2.5.2",
-    "sass": "^1.18.0",
+    "sass": "^1.19.0",
     "stylelint": "^10.0.1",
-    "stylelint-config-ship-shape": "^0.4.0",
+    "stylelint-config-ship-shape": "^0.5.2",
     "yauzl": "^2.10.0"
   },
   "engines": {