Merge branch 'master' into refactor/headers

components/settings/swatch.vue

@@ -4,10 +4,9 @@
     :data-color="color"
     :class="{ active: active }"
     v-tooltip="{ content: name || color }"
+    :style="{ backgroundColor: color }"
   >
-    <span :style="{ backgroundColor: color }" class="preview">
-      <i v-if="active" class="material-icons activeTick">done</i>
-    </span>
+    <i v-if="active" class="material-icons activeTick">done</i>
   </div>
 </template>
 
@@ -17,6 +16,7 @@
   align-items: center;
   justify-content: center;
   margin: 8px;
+  padding: 16px;
   border-radius: 100%;
   border: 3px solid var(--bg-dark-color);
   cursor: pointer;
@@ -33,19 +33,8 @@
     border: 3px solid var(--fg-color);
   }
 
-  .preview {
-    vertical-align: middle;
-    display: inline-block;
-    border-radius: 100%;
-    padding: 16px;
-    position: relative;
-
-    .activeTick {
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      transform: translate(-50%, -50%);
-    }
+  .activeTick {
+    position: absolute;
   }
 }
 </style>

package-lock.json

@@ -1176,9 +1176,9 @@
             "dev": true
         },
         "@hapi/hoek": {
-            "version": "8.5.0",
-            "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.0.tgz",
-            "integrity": "sha512-7XYT10CZfPsH7j9F1Jmg1+d0ezOux2oM2GfArAzLwWe4mE2Dr3hVjsAL6+TFY49RRJlCdJDMw3nJsLFroTc8Kw==",
+            "version": "8.5.1",
+            "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-8.5.1.tgz",
+            "integrity": "sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==",
             "dev": true
         },
         "@hapi/joi": {

pages/settings.vue

@@ -339,8 +339,9 @@ export default {
           "https://postwoman.apollotv.xyz/",
         PROXY_KEY: this.$store.state.postwoman.settings.PROXY_KEY || "",
         EXTENSIONS_ENABLED:
-          (typeof this.$store.state.postwoman.settings.EXTENSIONS_ENABLED !== 'undefined') ? 
-            this.$store.state.postwoman.settings.EXTENSIONS_ENABLED 
+          typeof this.$store.state.postwoman.settings.EXTENSIONS_ENABLED !==
+          "undefined"
+            ? this.$store.state.postwoman.settings.EXTENSIONS_ENABLED
             : true
       },