From 454f07fec9e8d3a6628b273e6a59abdf67f341f2 Mon Sep 17 00:00:00 2001 From: William Grant Date: Wed, 24 Aug 2022 12:04:33 +1000 Subject: [PATCH] refactor: finished converting sass colors in _quote.scss --- stylesheets/_quote.scss | 6 +++--- stylesheets/_theme_dark.scss | 2 +- stylesheets/_variables.scss | 3 --- ts/themes/SessionTheme.tsx | 3 +++ 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stylesheets/_quote.scss b/stylesheets/_quote.scss index bfce4bd9f..6051d2353 100644 --- a/stylesheets/_quote.scss +++ b/stylesheets/_quote.scss @@ -74,11 +74,11 @@ } .module-quote__reference-warning { - background-color: var(--color-black-color)-06; + background-color: var(--color-darkest-black-color); } .module-quote__reference-warning__icon { - @include color-svg('../images/broken-link.svg', $color-dark-30); + @include color-svg('../images/broken-link.svg', var(--color-light-gray-color)); } .module-quote__reference-warning__text { @@ -258,7 +258,7 @@ flex-direction: row; align-items: center; - background-color: $color-white-085; + background-color: var(--color-darkest-white-color); padding-inline-start: 8px; padding-inline-end: 8px; margin-inline-end: 8px; diff --git a/stylesheets/_theme_dark.scss b/stylesheets/_theme_dark.scss index 8ab65bbd1..18448cedb 100644 --- a/stylesheets/_theme_dark.scss +++ b/stylesheets/_theme_dark.scss @@ -198,7 +198,7 @@ // Module: Contact List Item .module-contact-list-item { - color: $color-dark-30; + color: var(--color-light-gray-color); } // Module: Message Detail diff --git a/stylesheets/_variables.scss b/stylesheets/_variables.scss index 74bb8f11d..450fc641c 100644 --- a/stylesheets/_variables.scss +++ b/stylesheets/_variables.scss @@ -15,12 +15,10 @@ $color-white-06: rgba(var(--color-white-color), 0.6); $color-white-07: rgba(var(--color-white-color), 0.7); $color-white-075: rgba(var(--color-white-color), 0.75); $color-white-08: rgba(var(--color-white-color), 0.8); -$color-white-085: rgba(var(--color-white-color), 0.85); $color-light-20: #c1c5cd; $color-light-60: #62656a; $color-light-90: #070c14; -$color-dark-30: #a8a9aa; $color-dark-55: #88898c; $color-dark-60: #797a7c; $color-dark-72: #31343c; @@ -31,7 +29,6 @@ $color-black-008-no-tranparency: #ededed; $color-black-016-no-tranparency: #d9d9d9; $color-black-012: rgba(var(--color-black-color), 0.12); $color-black-04: rgba(var(--color-black-color), 0.4); -$color-black-06: rgba(var(--color-black-color), 0.6); // Old colors diff --git a/ts/themes/SessionTheme.tsx b/ts/themes/SessionTheme.tsx index 58ecc6f30..c63a6c754 100644 --- a/ts/themes/SessionTheme.tsx +++ b/ts/themes/SessionTheme.tsx @@ -372,9 +372,12 @@ export const SessionGlobalStyles = createGlobalStyle` --color-black-color: ${black}; --color-light-black-color: ${`rgba(${black}, 0.2)`}; --color-lighter-black-color: ${`rgba(${black}, 0.15)`}; + --color-darkest-black-color: ${`rgba(${black}, 0.6)`}; --color-session-green-color: ${sessionGreenColor}; --color-white-color: ${white}; + --color-darkest-white-color: ${`rgba(${white}, 0.85)`}; + --color-gray-color: ${grayColor}; --color-light-gray-color: ${lightGrayColor}; --color-lighter-gray-color: ${lighterGrayColor};