Bump shepherd and stylelint

RobbieTheWagner · Jan 14, 2019 · 59f8d35 · 59f8d35
1 parent 4559b49
commit 59f8d35
Show file tree

Hide file tree

Showing 4 changed files with 109 additions and 574 deletions.
diff --git a/package.json b/package.json
@@ -62,7 +62,7 @@
     "ember-cli-node-assets": "0.2.2",
     "ember-getowner-polyfill": "^2.2.0",
     "fastboot-transform": "^0.1.3",
-    "shepherd.js": "^2.1.1"
+    "shepherd.js": "^2.2.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^0.7.0",
@@ -103,7 +103,7 @@
     "loader.js": "^4.7.0",
     "qunit-dom": "^0.8.0",
     "sass": "^1.16.0",
-    "stylelint-config-ship-shape": "^0.4.0"
+    "stylelint-config-ship-shape": "^0.5.2"
   },
   "engines": {
     "node": "6.* || 8.* || >= 10.*"

diff --git a/tests/dummy/app/styles/app.scss b/tests/dummy/app/styles/app.scss
@@ -30,6 +30,9 @@ h5,
 h6 {
   color: $whiteish;
   font-family: $f-primary;
+  font-weight: 400;
+  margin-bottom: 0.5rem;
+  margin-top: 0.2rem;
 }
 
 body {
@@ -114,6 +117,7 @@ a {
     }
 
     &[x-placement^="top"] {
+      // stylelint-disable-next-line
       .popper__arrow {
         border-top-color: $background1;
       }
@@ -124,6 +128,9 @@ a {
     }
 
     .shepherd-content {
+      max-width: 100%;
+      width: 400px;
+
       .shepherd-text {
         color: $whiteish;
 
@@ -135,28 +142,12 @@ a {
   }
 }
 
-.shepherd-element.shepherd-theme-arrows .shepherd-content {
-  max-width: 100%;
-  width: 400px;
-}
-
 .shepherd-element.shepherd-theme-arrows .shepherd-content footer .shepherd-buttons li .shepherd-button {
   font-size: 0.75em;
   line-height: 0.75em;
   padding-top: 1em;
 }
 
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-weight: 400;
-  margin-bottom: 0.5rem;
-  margin-top: 0.2rem;
-}
-
 pre {
   border: 1px solid rgba(0, 0, 0, 0.15);
   line-height: 1.4em;

diff --git a/tests/dummy/app/styles/prism-ghcolors.scss b/tests/dummy/app/styles/prism-ghcolors.scss
@@ -35,6 +35,14 @@ pre[class*="language-"] {
   word-spacing: normal;
 }
 
+/* Code blocks */
+pre[class*="language-"] {
+  background-color: $color1;
+  margin: 0.5em 0;
+  overflow: auto;
+  padding: 1em;
+}
+
 pre[class*="language-"]::-moz-selection,
 pre[class*="language-"] ::-moz-selection,
 code[class*="language-"]::-moz-selection,
@@ -49,14 +57,6 @@ code[class*="language-"] ::selection {
   background: #b3d4fc;
 }
 
-/* Code blocks */
-pre[class*="language-"] {
-  background-color: $color1;
-  margin: 0.5em 0;
-  overflow: auto;
-  padding: 1em;
-}
-
 /* Inline code */
 :not(pre) > code[class*="language-"] {
   background: $color1;
@@ -86,6 +86,11 @@ pre[class*="language-"] {
   color: $text-color;
 }
 
+.token.tag,
+.token.selector {
+  color: $keyword-color;
+}
+
 .token.entity,
 .token.url,
 .token.symbol,
@@ -95,29 +100,31 @@ pre[class*="language-"] {
 .token.constant,
 .token.property,
 .token.regex,
-.token.inserted {
-  color: $bright-text;
-}
-
+.token.inserted,
 .token.atrule,
 .token.keyword,
-.token.attr-name,
-.language-autohotkey .token.selector {
+.token.attr-name {
   color: $bright-text;
 }
 
+.language-autohotkey {
+  .token {
+    &.keyword {
+      color: $keyword-color;
+    }
+
+    &.selector {
+      color: $bright-text;
+    }
+  }
+}
+
 .token.function,
 .token.deleted,
 .language-autohotkey .token.tag {
   color: $dark-purple;
 }
 
-.token.tag,
-.token.selector,
-.language-autohotkey .token.keyword {
-  color: $keyword-color;
-}
-
 .token.important,
 .token.function,
 .token.bold {