From 82438a62e06fb2c1cd27000f4a017ede093bc08a Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Wed, 18 Apr 2018 21:38:16 -0700 Subject: [PATCH] upgrade to node-sass 4.8.3 (#165) --- package-lock.json | 16 +++-- package.json | 2 +- scss/themes/_base.scss | 148 +++++++++++++++++++-------------------- scss/themes/_dark.scss | 36 +++++----- scss/themes/cobalt.scss | 24 +++---- scss/themes/sorcery.scss | 10 +-- templates/2xx.html | 4 +- 7 files changed, 123 insertions(+), 117 deletions(-) diff --git a/package-lock.json b/package-lock.json index 7558c3e7..3bf97a38 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6425,7 +6425,8 @@ "nan": { "version": "2.8.0", "resolved": "https://registry.npmjs.org/nan/-/nan-2.8.0.tgz", - "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=" + "integrity": "sha1-7XFfP+neArV6XmJS2QqWZ14fCFo=", + "optional": true }, "nanoid": { "version": "1.0.2", @@ -6550,9 +6551,9 @@ } }, "node-sass": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.7.2.tgz", - "integrity": "sha512-CaV+wLqZ7//Jdom5aUFCpGNoECd7BbNhjuwdsX/LkXBrHl8eb1Wjw4HvWqcFvhr5KuNgAk8i/myf/MQ1YYeroA==", + "version": "4.8.3", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.8.3.tgz", + "integrity": "sha512-tfFWhUsCk/Y19zarDcPo5xpj+IW3qCfOjVdHtYeG6S1CKbQOh1zqylnQK6cV3z9k80yxAnFX9Y+a9+XysDhhfg==", "requires": { "async-foreach": "0.1.3", "chalk": "1.1.3", @@ -6566,7 +6567,7 @@ "lodash.mergewith": "4.6.1", "meow": "3.7.0", "mkdirp": "0.5.1", - "nan": "2.8.0", + "nan": "2.10.0", "node-gyp": "3.6.2", "npmlog": "4.1.2", "request": "2.79.0", @@ -6583,6 +6584,11 @@ "lru-cache": "4.1.1", "which": "1.3.0" } + }, + "nan": { + "version": "2.10.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", + "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==" } } }, diff --git a/package.json b/package.json index ba303bbe..d707ea16 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "mini-css-extract-plugin": "0.4.0", "mkdirp": "0.5.1", "node-fetch": "2.1.2", - "node-sass": "4.7.2", + "node-sass": "4.8.3", "npm-run-all": "4.1.2", "optimize-css-assets-webpack-plugin": "4.0.0", "p-any": "1.1.0", diff --git a/scss/themes/_base.scss b/scss/themes/_base.scss index efca28b6..7014f8d9 100644 --- a/scss/themes/_base.scss +++ b/scss/themes/_base.scss @@ -2,95 +2,95 @@ $deemphasized-color: #666; - --button-primary-bg: lighten($main-theme-color, 7%); - --button-primary-text: $secondary-text-color; - --button-primary-border: darken($main-theme-color, 30%); - --button-primary-bg-active: lighten($main-theme-color, 1%); - --button-primary-bg-hover: lighten($main-theme-color, 9%); + --button-primary-bg: #{lighten($main-theme-color, 7%)}; + --button-primary-text: #{$secondary-text-color}; + --button-primary-border: #{darken($main-theme-color, 30%)}; + --button-primary-bg-active: #{lighten($main-theme-color, 1%)}; + --button-primary-bg-hover: #{lighten($main-theme-color, 9%)}; - --button-bg: darken($main-bg-color, 10%); - --button-text: $main-text-color; - --button-border: darken($border-color, 20%); - --button-bg-active: darken($main-bg-color, 25%); - --button-bg-hover: darken($main-bg-color, 5%); + --button-bg: #{darken($main-bg-color, 10%)}; + --button-text: #{$main-text-color}; + --button-border: #{darken($border-color, 20%)}; + --button-bg-active: #{darken($main-bg-color, 25%)}; + --button-bg-hover: #{darken($main-bg-color, 5%)}; - --input-border: $border-color; - --anchor-text: $anchor-color; - --main-bg: $main-bg-color; - --body-bg: $body-bg-color; - --body-text-color: $main-text-color; - --main-border: $border-color; - --svg-fill: $main-theme-color; + --input-border: #{$border-color}; + --anchor-text: #{$anchor-color}; + --main-bg: #{$main-bg-color}; + --body-bg: #{$body-bg-color}; + --body-text-color: #{$main-text-color}; + --main-border: #{$border-color}; + --svg-fill: #{$main-theme-color}; - --form-bg: darken($main-bg-color, 3%); - --form-border: darken($border-color, 10%); + --form-bg: #{darken($main-bg-color, 3%)}; + --form-border: #{darken($border-color, 10%)}; - --nav-bg: $main-theme-color; - --nav-border: darken($main-theme-color, 10%); - --nav-a-border: $main-theme-color; - --nav-a-selected-border: $secondary-text-color; - --nav-a-selected-bg: lighten($main-theme-color, 10%); - --nav-svg-fill: $secondary-text-color; - --nav-text-color: $secondary-text-color; + --nav-bg: #{$main-theme-color}; + --nav-border: #{darken($main-theme-color, 10%)}; + --nav-a-border: #{$main-theme-color}; + --nav-a-selected-border: #{$secondary-text-color}; + --nav-a-selected-bg: #{lighten($main-theme-color, 10%)}; + --nav-svg-fill: #{$secondary-text-color}; + --nav-text-color: #{$secondary-text-color}; - --nav-a-selected-border-hover: $secondary-text-color; - --nav-a-selected-bg-hover: lighten($main-theme-color, 15%); - --nav-a-bg-hover: lighten($main-theme-color, 5%); - --nav-a-border-hover: $main-theme-color; - --nav-svg-fill-hover: $secondary-text-color; - --nav-text-color-hover: $secondary-text-color; + --nav-a-selected-border-hover: #{$secondary-text-color}; + --nav-a-selected-bg-hover: #{lighten($main-theme-color, 15%)}; + --nav-a-bg-hover: #{lighten($main-theme-color, 5%)}; + --nav-a-border-hover: #{$main-theme-color}; + --nav-svg-fill-hover: #{$secondary-text-color}; + --nav-text-color-hover: #{$secondary-text-color}; - --action-button-fill-color: lighten($main-theme-color, 18%); - --action-button-fill-color-hover: lighten($main-theme-color, 22%); - --action-button-fill-color-active: lighten($main-theme-color, 5%); - --action-button-fill-color-pressed: darken($main-theme-color, 7%); - --action-button-fill-color-pressed-hover: darken($main-theme-color, 2%); - --action-button-fill-color-pressed-active: darken($main-theme-color, 15%); + --action-button-fill-color: #{lighten($main-theme-color, 18%)}; + --action-button-fill-color-hover: #{lighten($main-theme-color, 22%)}; + --action-button-fill-color-active: #{lighten($main-theme-color, 5%)}; + --action-button-fill-color-pressed: #{darken($main-theme-color, 7%)}; + --action-button-fill-color-pressed-hover: #{darken($main-theme-color, 2%)}; + --action-button-fill-color-pressed-active: #{darken($main-theme-color, 15%)}; - --action-button-deemphasized-fill-color: $deemphasized-color; - --action-button-deemphasized-fill-color-hover: lighten($deemphasized-color, 22%); - --action-button-deemphasized-fill-color-active: lighten($deemphasized-color, 5%); - --action-button-deemphasized-fill-color-pressed: darken($deemphasized-color, 7%); - --action-button-deemphasized-fill-color-pressed-hover: darken($deemphasized-color, 2%); - --action-button-deemphasized-fill-color-pressed-active: darken($deemphasized-color, 15%); + --action-button-deemphasized-fill-color: #{$deemphasized-color}; + --action-button-deemphasized-fill-color-hover: #{lighten($deemphasized-color, 22%)}; + --action-button-deemphasized-fill-color-active: #{lighten($deemphasized-color, 5%)}; + --action-button-deemphasized-fill-color-pressed: #{darken($deemphasized-color, 7%)}; + --action-button-deemphasized-fill-color-pressed-hover: #{darken($deemphasized-color, 2%)}; + --action-button-deemphasized-fill-color-pressed-active: #{darken($deemphasized-color, 15%)}; - --settings-list-item-bg: $main-bg-color; - --settings-list-item-text: $main-theme-color; - --settings-list-item-text-hover: $main-theme-color; - --settings-list-item-border: $border-color; - --settings-list-item-bg-active: darken($main-bg-color, 10%); - --settings-list-item-bg-hover: darken($main-bg-color, 2%); + --settings-list-item-bg: #{$main-bg-color}; + --settings-list-item-text: #{$main-theme-color}; + --settings-list-item-text-hover: #{$main-theme-color}; + --settings-list-item-border: #{$border-color}; + --settings-list-item-bg-active: #{darken($main-bg-color, 10%)}; + --settings-list-item-bg-hover: #{darken($main-bg-color, 2%)}; - --toast-bg: $toast-bg; - --toast-border: $toast-border; - --toast-text: $secondary-text-color; + --toast-bg: #{$toast-bg}; + --toast-border: #{$toast-border}; + --toast-text: #{$secondary-text-color}; - --mask-bg: $toast-bg; - --mask-svg-fill: $secondary-text-color; - --mask-opaque-bg: rgba($toast-bg, 0.8); - --loading-bg: #ededed; + --mask-bg: #{$toast-bg}; + --mask-svg-fill: #{$secondary-text-color}; + --mask-opaque-bg: #{rgba($toast-bg, 0.8)}; + --loading-bg: #{#ededed}; - --account-profile-bg-backdrop-filter: rgba($main-bg-color, 0.7); - --account-profile-bg: rgba($main-bg-color, 0.9); + --account-profile-bg-backdrop-filter: #{rgba($main-bg-color, 0.7)}; + --account-profile-bg: #{rgba($main-bg-color, 0.9)}; - --deemphasized-text-color:$deemphasized-color; - --focus-outline: $focus-outline; + --deemphasized-text-color: #{$deemphasized-color}; + --focus-outline: #{$focus-outline}; - --very-deemphasized-link-color: rgba($anchor-color, 0.6); - --very-deemphasized-text-color: rgba(#666, 0.6); + --very-deemphasized-link-color: #{rgba($anchor-color, 0.6)}; + --very-deemphasized-text-color: #{rgba(#666, 0.6)}; - --status-direct-background: darken($body-bg-color, 5%); - --main-theme-color: $main-theme-color; - --warning-color: #e01f19; - --alt-input-bg: rgba($main-bg-color, 0.7); + --status-direct-background: #{darken($body-bg-color, 5%)}; + --main-theme-color: #{$main-theme-color}; + --warning-color: #{#e01f19}; + --alt-input-bg: #{rgba($main-bg-color, 0.7)}; - --muted-modal-bg: transparent; - --muted-modal-focus: #999; - --muted-modal-hover: rgba(255, 255, 255, 0.2); + --muted-modal-bg: #{transparent}; + --muted-modal-focus: #{#999}; + --muted-modal-hover: #{rgba(255, 255, 255, 0.2)}; - --compose-autosuggest-item-hover: $compose-background; - --compose-autosuggest-item-active: darken($compose-background, 5%); - --compose-autosuggest-outline: lighten($focus-outline, 5%); + --compose-autosuggest-item-hover: #{$compose-background}; + --compose-autosuggest-item-active: #{darken($compose-background, 5%)}; + --compose-autosuggest-outline: #{lighten($focus-outline, 5%)}; - --compose-button-halo: rgba(255, 255, 255, 0.1); + --compose-button-halo: #{rgba(255, 255, 255, 0.1)}; } diff --git a/scss/themes/_dark.scss b/scss/themes/_dark.scss index 281d5752..6d616d83 100644 --- a/scss/themes/_dark.scss +++ b/scss/themes/_dark.scss @@ -1,28 +1,28 @@ @mixin darkTheme() { $deemphasized-color: lighten($main-bg-color, 45%); - --action-button-deemphasized-fill-color: $deemphasized-color; - --action-button-deemphasized-fill-color-hover: lighten($deemphasized-color, 22%); - --action-button-deemphasized-fill-color-active: lighten($deemphasized-color, 5%); - --action-button-deemphasized-fill-color-pressed: darken($deemphasized-color, 7%); - --action-button-deemphasized-fill-color-pressed-hover: darken($deemphasized-color, 2%); - --action-button-deemphasized-fill-color-pressed-active: darken($deemphasized-color, 15%); + --action-button-deemphasized-fill-color: #{$deemphasized-color}; + --action-button-deemphasized-fill-color-hover: #{lighten($deemphasized-color, 22%)}; + --action-button-deemphasized-fill-color-active: #{lighten($deemphasized-color, 5%)}; + --action-button-deemphasized-fill-color-pressed: #{darken($deemphasized-color, 7%)}; + --action-button-deemphasized-fill-color-pressed-hover: #{darken($deemphasized-color, 2%)}; + --action-button-deemphasized-fill-color-pressed-active: #{darken($deemphasized-color, 15%)}; - --loading-bg: #ededed; + --loading-bg: #{#ededed}; - --deemphasized-text-color:$deemphasized-color; + --deemphasized-text-color: #{$deemphasized-color}; - --very-deemphasized-link-color: rgba($anchor-color, 0.8); - --very-deemphasized-text-color: lighten($main-bg-color, 32%); + --very-deemphasized-link-color: #{rgba($anchor-color, 0.8)}; + --very-deemphasized-text-color: #{lighten($main-bg-color, 32%)}; - --status-direct-background: darken($body-bg-color, 5%); - --main-theme-color: $main-theme-color; - --warning-color: #c7423d; - --alt-input-bg: rgba($main-bg-color, 0.7); + --status-direct-background: #{darken($body-bg-color, 5%)}; + --main-theme-color: #{$main-theme-color}; + --warning-color: #{#c7423d}; + --alt-input-bg: #{rgba($main-bg-color, 0.7)}; - --muted-modal-bg: transparent; - --muted-modal-focus: #999; - --muted-modal-hover: rgba(255, 255, 255, 0.2); + --muted-modal-bg: #{transparent}; + --muted-modal-focus: #{#999}; + --muted-modal-hover: #{rgba(255, 255, 255, 0.2)}; - --compose-button-halo: rgba(255, 255, 255, 0.1); + --compose-button-halo: #{rgba(255, 255, 255, 0.1)}; } \ No newline at end of file diff --git a/scss/themes/cobalt.scss b/scss/themes/cobalt.scss index 01bb8712..fd7d7609 100644 --- a/scss/themes/cobalt.scss +++ b/scss/themes/cobalt.scss @@ -17,19 +17,19 @@ body.theme-cobalt { @include baseTheme(); @include darkTheme(); - --settings-list-item-text: $main-text-color; - --settings-list-item-text-hover: $main-text-color; + --settings-list-item-text: #{$main-text-color}; + --settings-list-item-text-hover: #{$main-text-color}; - --action-button-fill-color-pressed: $anchor-color; - --action-button-fill-color-pressed-hover: darken($anchor-color, 2%); - --action-button-fill-color-pressed-active: darken($anchor-color, 15%); + --action-button-fill-color-pressed: #{$anchor-color}; + --action-button-fill-color-pressed-hover: #{darken($anchor-color, 2%)}; + --action-button-fill-color-pressed-active: #{darken($anchor-color, 15%)}; - --svg-fill: $secondary-text-color; + --svg-fill: #{$secondary-text-color}; - --nav-svg-fill: $main-text-color; - --nav-text-color: $main-text-color; - --nav-svg-fill-hover: $main-text-color; - --nav-text-color-hover: $main-text-color; - --nav-a-selected-border: $anchor-color; - --nav-a-selected-border-hover: $anchor-color; + --nav-svg-fill: #{$main-text-color}; + --nav-text-color: #{$main-text-color}; + --nav-svg-fill-hover: #{$main-text-color}; + --nav-text-color-hover: #{$main-text-color}; + --nav-a-selected-border: #{$anchor-color}; + --nav-a-selected-border-hover: #{$anchor-color}; } diff --git a/scss/themes/sorcery.scss b/scss/themes/sorcery.scss index 5888b374..af0e22c8 100644 --- a/scss/themes/sorcery.scss +++ b/scss/themes/sorcery.scss @@ -18,10 +18,10 @@ body.theme-sorcery { @include baseTheme(); @include darkTheme(); - --nav-bg: lighten($body-bg-color, 10%); - --nav-a-selected-bg: lighten($body-bg-color, 25%); - --nav-a-bg-hover: lighten($body-bg-color, 25%); - --nav-a-selected-bg-hover: lighten($body-bg-color, 40%); + --nav-bg: #{lighten($body-bg-color, 10%)}; + --nav-a-selected-bg: #{lighten($body-bg-color, 25%)}; + --nav-a-bg-hover: #{lighten($body-bg-color, 25%)}; + --nav-a-selected-bg-hover: #{lighten($body-bg-color, 40%)}; - --button-primary-bg: darken($main-theme-color, 5%); + --button-primary-bg: #{darken($main-theme-color, 5%)}; } \ No newline at end of file diff --git a/templates/2xx.html b/templates/2xx.html index 2536f2f2..7a9aca2f 100644 --- a/templates/2xx.html +++ b/templates/2xx.html @@ -16,9 +16,9 @@