From 6e2d37b474aafc1e45fcd228eac5f9b4fe3b34e5 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 22 Jan 2020 09:26:39 -0500 Subject: [PATCH] color cleanup --- ui/scss/component/_card.scss | 2 +- ui/scss/component/_header.scss | 2 +- ui/scss/component/menu-button.scss | 2 +- ui/scss/init/_vars.scss | 3 +-- ui/scss/themes/dark.scss | 3 +-- ui/scss/themes/light.scss | 1 - 6 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ui/scss/component/_card.scss b/ui/scss/component/_card.scss index f04fa0216..fb55055fc 100644 --- a/ui/scss/component/_card.scss +++ b/ui/scss/component/_card.scss @@ -3,7 +3,7 @@ margin-bottom: var(--spacing-large); position: relative; border-radius: var(--card-radius); - box-shadow: var(--card-box-shadow) var(--color-box-shadow); + box-shadow: var(--card-box-shadow); overflow: hidden; @media (max-width: $breakpoint-small) { diff --git a/ui/scss/component/_header.scss b/ui/scss/component/_header.scss index 91c4b27e2..29f172083 100644 --- a/ui/scss/component/_header.scss +++ b/ui/scss/component/_header.scss @@ -4,7 +4,7 @@ top: 0; width: 100%; background-color: var(--color-header-background); - box-shadow: var(--card-box-shadow) var(--color-box-shadow); + box-shadow: var(--card-box-shadow); font-size: var(--font-body); -webkit-user-select: none; -webkit-app-region: drag; diff --git a/ui/scss/component/menu-button.scss b/ui/scss/component/menu-button.scss index ccb82b5d5..d98b59c92 100644 --- a/ui/scss/component/menu-button.scss +++ b/ui/scss/component/menu-button.scss @@ -53,7 +53,7 @@ .menu__list--header { margin-top: 19px; margin-left: calc(var(--spacing-medium) * -1); - box-shadow: var(--card-box-shadow--attached) var(--color-box-shadow); + box-shadow: var(--card-box-shadow); animation: menu-animate-in var(--animation-duration) var(--animation-style); } diff --git a/ui/scss/init/_vars.scss b/ui/scss/init/_vars.scss index 4eb25d188..92bfbaaa1 100644 --- a/ui/scss/init/_vars.scss +++ b/ui/scss/init/_vars.scss @@ -42,8 +42,7 @@ $breakpoint-small: 900px; // Card --card-radius: var(--border-radius); --card-max-width: 1000px; - --card-box-shadow: 0px 2px 6px 0px; - --card-box-shadow--attached: 0px 4px 6px 0px; + --card-box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); // Modal --modal-width: 440px; diff --git a/ui/scss/themes/dark.scss b/ui/scss/themes/dark.scss index 93c73ead2..5c0c1b2ca 100644 --- a/ui/scss/themes/dark.scss +++ b/ui/scss/themes/dark.scss @@ -60,7 +60,7 @@ --color-menu-background: var(--color-header-background); --color-menu-background--selected: #89939e; --color-menu-background--active: #89939e; - --color-menu-icon: var(--color-link-icon); + --color-menu-icon: #a7a7a7; --color-menu-icon-active: #d6d6d6; // Table @@ -69,7 +69,6 @@ // Search --color-search-suggestion: #212529; --color-search-suggestion-background: #cce6fb; - --color-box-shadow: #212529; --color-placeholder-background: #4e5862; --color-spinner-light: #5a6570; --color-spinner-dark: #212529; diff --git a/ui/scss/themes/light.scss b/ui/scss/themes/light.scss index cca89a037..db770b665 100644 --- a/ui/scss/themes/light.scss +++ b/ui/scss/themes/light.scss @@ -26,7 +26,6 @@ --color-spinner-light: #ffffff; --color-spinner-dark: #212529; - --color-box-shadow: #c4c4c4; --color-placeholder-background: #f0f0f0; --color-header-background: #ffffff; --color-card-background: #ffffff;