From 09bf68b1bdac149be670f5e8b1a7e5070f8566e8 Mon Sep 17 00:00:00 2001
From: Nad Chishtie <n.chishtie@gmail.com>
Date: Thu, 20 Dec 2018 12:46:43 +0000
Subject: [PATCH] Improved colours.

---
 res/css/_common.scss                 |  4 ++--
 res/css/structures/_RoomSubList.scss |  2 +-
 res/css/views/rooms/_EventTile.scss  |  2 +-
 res/css/views/rooms/_RoomTile.scss   |  2 +-
 res/themes/dharma/css/_dharma.scss   | 11 ++++++-----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/res/css/_common.scss b/res/css/_common.scss
index 149ec75569..797070d4e2 100644
--- a/res/css/_common.scss
+++ b/res/css/_common.scss
@@ -47,7 +47,7 @@ h2 {
 a:hover,
 a:link,
 a:visited {
-    color: $accent-color;
+    color: $accent-color-alt;
 }
 
 input[type=text], input[type=password], textarea {
@@ -301,7 +301,7 @@ textarea {
 }
 
 .mx_textButton {
-    @mixin mx_DialogButton_small;    
+    @mixin mx_DialogButton_small;
 }
 
 .mx_textButton:hover {
diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index 78208d7d7c..2d471ee198 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -114,7 +114,7 @@ limitations under the License.
 }
 
 .mx_RoomSubList_badgeHighlight {
-    background-color: $accent-color;
+    background-color: $warning-color;
 }
 
 .mx_RoomSubList_chevron {
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index 52074563f6..154e5390c8 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -445,7 +445,7 @@ limitations under the License.
 }
 
 .mx_EventTile_content .markdown-body a {
-    color: $accent-color;
+    color: $accent-color-alt;
 }
 
 .mx_EventTile_content .markdown-body .hljs {
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index 104691430a..232b715f7a 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -116,7 +116,7 @@ limitations under the License.
 }
 
 .mx_RoomTile_highlight .mx_RoomTile_badge {
-    background-color: $accent-color;
+    background-color: $warning-color;
 }
 
 .mx_RoomTile_unread, .mx_RoomTile_highlight {
diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss
index c9930168f0..0851762be2 100644
--- a/res/themes/dharma/css/_dharma.scss
+++ b/res/themes/dharma/css/_dharma.scss
@@ -20,19 +20,20 @@ $focus-bg-color: #dddddd;
 
 // button UI (white-on-green in light skin)
 $accent-fg-color: #ffffff;
-$accent-color: #f56679;
-$accent-color-50pct: #f56679;
+$accent-color: #7ac9a1;
+$accent-color-50pct: #92caad;
+$accent-color-alt: #238CF5;
 
 $selection-fg-color: $primary-bg-color;
 
-$focus-brightness: 125%;
+$focus-brightness: 105%;
 
 // red warning colour
-$warning-color: #ff0064;
+$warning-color: #f56679;
 // background colour for warnings
 $warning-bg-color: #DF2A8B;
 $info-bg-color: #2A9EDF;
-$mention-user-pill-bg-color: #ff0064;
+$mention-user-pill-bg-color: $warning-color;
 $other-user-pill-bg-color: rgba(0, 0, 0, 0.1);
 
 // pinned events indicator