From e658d9619b3896a43f9395952a5cce3349f41344 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 23 Sep 2020 12:30:01 -0600
Subject: [PATCH] Update styles for new colours

---
 res/css/views/settings/_AvatarSetting.scss     | 8 ++------
 res/themes/dark/css/_dark.scss                 | 2 ++
 res/themes/legacy-dark/css/_legacy-dark.scss   | 2 ++
 res/themes/legacy-light/css/_legacy-light.scss | 2 ++
 res/themes/light/css/_light.scss               | 2 ++
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/res/css/views/settings/_AvatarSetting.scss b/res/css/views/settings/_AvatarSetting.scss
index d2c0268a5c..3576b09888 100644
--- a/res/css/views/settings/_AvatarSetting.scss
+++ b/res/css/views/settings/_AvatarSetting.scss
@@ -102,15 +102,11 @@ limitations under the License.
         right: 0;
     }
 
-    .mx_AvatarSetting_avatarPlaceholder ~ .mx_AvatarSetting_uploadButton {
-        border: 1px solid $settings-profile-overlay-placeholder-fg-color;
-    }
-
     .mx_AvatarSetting_uploadButton {
         width: 32px;
         height: 32px;
         border-radius: 32px;
-        background-color: $settings-profile-placeholder-bg-color;
+        background-color: $settings-profile-button-bg-color;
 
         position: absolute;
         bottom: 0;
@@ -125,7 +121,7 @@ limitations under the License.
         mask-repeat: no-repeat;
         mask-position: center;
         mask-size: 55%;
-        background-color: $settings-profile-overlay-placeholder-fg-color;
+        background-color: $settings-profile-button-fg-color;
         mask-image: url('$(res)/img/feather-customised/edit.svg');
     }
 }
diff --git a/res/themes/dark/css/_dark.scss b/res/themes/dark/css/_dark.scss
index bb494811d4..331b5f4692 100644
--- a/res/themes/dark/css/_dark.scss
+++ b/res/themes/dark/css/_dark.scss
@@ -89,6 +89,8 @@ $lightbox-background-bg-color: #000;
 $settings-grey-fg-color: #a2a2a2;
 $settings-profile-placeholder-bg-color: #21262c;
 $settings-profile-overlay-placeholder-fg-color: #454545;
+$settings-profile-button-bg-color: #e7e7e7;
+$settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
 $settings-subsection-fg-color: $text-secondary-color;
 
 $topleftmenu-color: $text-primary-color;
diff --git a/res/themes/legacy-dark/css/_legacy-dark.scss b/res/themes/legacy-dark/css/_legacy-dark.scss
index b49e014e70..14ce264bc0 100644
--- a/res/themes/legacy-dark/css/_legacy-dark.scss
+++ b/res/themes/legacy-dark/css/_legacy-dark.scss
@@ -87,6 +87,8 @@ $lightbox-background-bg-color: #000;
 $settings-grey-fg-color: #a2a2a2;
 $settings-profile-placeholder-bg-color: #e7e7e7;
 $settings-profile-overlay-placeholder-fg-color: #454545;
+$settings-profile-button-bg-color: #e7e7e7;
+$settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
 $settings-subsection-fg-color: $text-secondary-color;
 
 $topleftmenu-color: $text-primary-color;
diff --git a/res/themes/legacy-light/css/_legacy-light.scss b/res/themes/legacy-light/css/_legacy-light.scss
index 9261dc8240..b030fb7423 100644
--- a/res/themes/legacy-light/css/_legacy-light.scss
+++ b/res/themes/legacy-light/css/_legacy-light.scss
@@ -145,6 +145,8 @@ $blockquote-fg-color: #777;
 $settings-grey-fg-color: #a2a2a2;
 $settings-profile-placeholder-bg-color: #e7e7e7;
 $settings-profile-overlay-placeholder-fg-color: #2e2f32;
+$settings-profile-button-bg-color: #e7e7e7;
+$settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
 $settings-subsection-fg-color: #61708b;
 
 $voip-decline-color: #f48080;
diff --git a/res/themes/light/css/_light.scss b/res/themes/light/css/_light.scss
index 8dd21b74ec..140783212d 100644
--- a/res/themes/light/css/_light.scss
+++ b/res/themes/light/css/_light.scss
@@ -139,6 +139,8 @@ $blockquote-fg-color: #777;
 $settings-grey-fg-color: #a2a2a2;
 $settings-profile-placeholder-bg-color: #f4f6fa;
 $settings-profile-overlay-placeholder-fg-color: #2e2f32;
+$settings-profile-button-bg-color: #e7e7e7;
+$settings-profile-button-fg-color: $settings-profile-overlay-placeholder-fg-color;
 $settings-subsection-fg-color: #61708b;
 
 $voip-decline-color: #f48080;