From d7473c4f4dd7046ee8e5ec588a8d4d3a1e5bf72a Mon Sep 17 00:00:00 2001
From: Nad Chishtie <n.chishtie@gmail.com>
Date: Thu, 20 Dec 2018 11:35:21 +0000
Subject: [PATCH] Various colour, contrast and legibility improvements.

---
 res/css/structures/_RoomSubList.scss | 4 ++--
 res/css/views/rooms/_RoomTile.scss   | 4 ++--
 res/img/icons-close.svg              | 8 ++++----
 res/img/topleft-chevron.svg          | 2 +-
 res/themes/dharma/css/_dharma.scss   | 9 ++++++---
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/res/css/structures/_RoomSubList.scss b/res/css/structures/_RoomSubList.scss
index a3319669cb..78208d7d7c 100644
--- a/res/css/structures/_RoomSubList.scss
+++ b/res/css/structures/_RoomSubList.scss
@@ -94,7 +94,7 @@ limitations under the License.
     font-weight: 600;
     font-size: 12px;
     padding: 0 5px;
-    background-color: $accent-color;
+    background-color: $roomtile-name-color;
 }
 
 .mx_RoomSubList_addRoom, .mx_RoomSubList_badge {
@@ -114,7 +114,7 @@ limitations under the License.
 }
 
 .mx_RoomSubList_badgeHighlight {
-    background-color: $warning-color;
+    background-color: $accent-color;
 }
 
 .mx_RoomSubList_chevron {
diff --git a/res/css/views/rooms/_RoomTile.scss b/res/css/views/rooms/_RoomTile.scss
index d5ec3d365a..19dfbb3c26 100644
--- a/res/css/views/rooms/_RoomTile.scss
+++ b/res/css/views/rooms/_RoomTile.scss
@@ -112,11 +112,11 @@ limitations under the License.
 }
 
 .mx_RoomTile_unreadNotify .mx_RoomTile_badge {
-    background-color: $accent-color;
+    background-color: $roomtile-name-color;
 }
 
 .mx_RoomTile_highlight .mx_RoomTile_badge {
-    background-color: $warning-color;
+    background-color: $accent-color;
 }
 
 .mx_RoomTile_unread, .mx_RoomTile_highlight {
diff --git a/res/img/icons-close.svg b/res/img/icons-close.svg
index e516140dd2..b2dd44fc26 100644
--- a/res/img/icons-close.svg
+++ b/res/img/icons-close.svg
@@ -75,22 +75,22 @@
 				<g
    id="icons_create_room"
    transform="translate(20,18)">
-					
+
 					<path
    id="Line"
    class="st1"
    d="M -2.5,28.5 4.6,21.4"
-   style="fill:none;stroke:#9fa9ba;stroke-width:2;stroke-linecap:round;stroke-opacity:1"
+   style="fill:none;stroke:#454545;stroke-width:2;stroke-linecap:round;stroke-opacity:1"
    inkscape:connector-curvature="0" />
 					<path
    id="Line_1_"
    class="st1"
    d="m -2.5,21.5 7.1,7.1"
-   style="fill:none;stroke:#9fa9ba;stroke-width:2;stroke-linecap:round;stroke-opacity:1"
+   style="fill:none;stroke:#454545;stroke-width:2;stroke-linecap:round;stroke-opacity:1"
    inkscape:connector-curvature="0" />
 				</g>
 			</g>
 		</g>
 	</g>
 </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/res/img/topleft-chevron.svg b/res/img/topleft-chevron.svg
index fa89852874..1cfeaf6352 100644
--- a/res/img/topleft-chevron.svg
+++ b/res/img/topleft-chevron.svg
@@ -64,7 +64,7 @@
     <g
        id="matrix-my-stuff-no-lines-message-context-menu-smaller-icons"
        transform="translate(-203,-25)"
-       style="stroke:#212121;stroke-width:1.29999995">
+       style="stroke:#61708b;stroke-width:1.6">
       <g
          id="Group-3"
          transform="translate(128,15)">
diff --git a/res/themes/dharma/css/_dharma.scss b/res/themes/dharma/css/_dharma.scss
index 805e13b579..c9930168f0 100644
--- a/res/themes/dharma/css/_dharma.scss
+++ b/res/themes/dharma/css/_dharma.scss
@@ -121,13 +121,13 @@ $rte-group-pill-color: #aaa;
 
 $topleftmenu-color: #212121;
 $roomheader-color: #45474a;
-$roomheader-addroom-color: #929eb4;
+$roomheader-addroom-color: #91A1C0;
 $roomtopic-color: #9fa9ba;
 $eventtile-meta-color: $roomtopic-color;
 
 // ********************
 
-$roomtile-name-color: #929eb4;
+$roomtile-name-color: #61708b;
 $roomtile-selected-color: #212121;
 $roomtile-notified-color: #212121;
 $roomtile-selected-bg-color: #fff;
@@ -215,7 +215,10 @@ $progressbar-color: #000;
         > input[type=search] {
             border: none;
             flex: 1;
-            color: inherit; //from .mx_textinput
+            color: $primary-fg-color;
+        },
+        input::placeholder {
+          color: $roomsublist-label-fg-color;
         }
     }
 }