diff --git a/ui/js/util/setTheme.js b/ui/js/util/setTheme.js index 71c101298..9add03811 100644 --- a/ui/js/util/setTheme.js +++ b/ui/js/util/setTheme.js @@ -3,6 +3,7 @@ import { existsSync } from "fs"; import { remote } from "electron"; function setTheme(name) { + /* const link = document.getElementById("theme"); const file = `${name}.css`; const path = `${remote.app.getAppPath()}/dist/themes/${file}`; @@ -14,6 +15,7 @@ function setTheme(name) { link.href = `./themes/light.css`; lbry.setClientSetting("theme", "light"); } + */ } export default setTheme; diff --git a/ui/scss/_vars.scss b/ui/scss/_vars.scss index c2006d588..5d9e3a75c 100644 --- a/ui/scss/_vars.scss +++ b/ui/scss/_vars.scss @@ -4,13 +4,18 @@ /* Colors */ --color-primary: #155B4A; - --color-black-transparent: rgba(32,32,32,0.9); + --color-primary-light: saturate(lighten(#155B4A, 50%), 20%); + --color-light-alt: hsl(hue(#155B4A), 15, 85); + --color-dark-overlay: rgba(32,32,32,0.9); --color-help: rgba(0,0,0,.6); --color-notice: #8a6d3b; --color-error: #a94442; --color-load-screen-text: #c3c3c3; --color-money: #216C2A; --color-meta-light: #505050; + --color-canvas: #f5f5f5; + --color-bg: #ffffff; + --color-bg-alt: #D9D9D9; /* Font */ --font-size: 16px; @@ -22,8 +27,6 @@ --box-shadow-focus: 2px 4px 4px 0 rgba(0,0,0,.14),2px 5px 3px -2px rgba(0,0,0,.2),2px 3px 7px 0 rgba(0,0,0,.12); /* Misc */ - --page-constrained-width: 800px; - --mobile-width-threshold: 801px; --content-max-width: 1000px; --standard-transition: .225s ease; --nsfw-blur-intensity: 20px; @@ -49,10 +52,10 @@ --header-height: $spacing-vertical * 2.5; /* Window */ - --window-bg: #f5f5f5; + --window-bg: var(--color-canvas); /* Card */ - --card-bg: #FFF; + --card-bg: var(--color-bg); --card-hover-translate: 10px; --card-margin: $spacing-vertical * 2/3; --card-max-width: $width-page-constrained; @@ -64,7 +67,7 @@ /* Tooltip */ --tooltip-body-width: 300px; - --tooltip-bg: #FFF; + --tooltip-bg: var(--color-bg); --tooltip-color: var(--text-color); --tooltip-shadow: var(--box-shadow-layer); } diff --git a/ui/scss/component/_modal.scss b/ui/scss/component/_modal.scss index f1cd56834..c320a6475 100644 --- a/ui/scss/component/_modal.scss +++ b/ui/scss/component/_modal.scss @@ -52,7 +52,7 @@ } .error-modal-overlay { - background: var(--color-dark-transparent); + background: var(--color-dark-overlay); } .error-modal__content { diff --git a/ui/scss/component/_snack-bar.scss b/ui/scss/component/_snack-bar.scss index be517ee41..1d057b16f 100644 --- a/ui/scss/component/_snack-bar.scss +++ b/ui/scss/component/_snack-bar.scss @@ -16,7 +16,7 @@ $padding-snack-horizontal: $spacing-vertical; margin-right: auto; min-width: 300px; max-width: 500px; - background: var(--color-black-transparent); + background: var(--color-dark-overlay); color: #f0f0f0; display: flex; diff --git a/ui/scss/component/_video.scss b/ui/scss/component/_video.scss index 5540c635a..0f7f860ff 100644 --- a/ui/scss/component/_video.scss +++ b/ui/scss/component/_video.scss @@ -119,7 +119,7 @@ video { font-size: $spacing-vertical * 3; color: white; z-index: 1; - background: var(--color-black-transparent); + background: var(--color-dark-overlay); opacity: 0.6; left: 0; top: 0;