From 4f8d3b0e2b02e3c41344e86abd57aff555d7c1e0 Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 17 Jan 2017 02:00:34 +0000
Subject: [PATCH] more factoring

---
 src/skins/vector/css/_common.scss                             | 4 ++--
 .../vector/css/matrix-react-sdk/structures/_RoomView.scss     | 2 +-
 src/skins/vector/css/themes/_base.scss                        | 2 ++
 src/skins/vector/css/themes/_dark.scss                        | 2 ++
 src/skins/vector/css/vector-web/structures/_RightPanel.scss   | 3 ++-
 .../vector/css/vector-web/structures/_RoomDirectory.scss      | 2 +-
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/skins/vector/css/_common.scss b/src/skins/vector/css/_common.scss
index 09f3fcfb56..01ba81d83e 100644
--- a/src/skins/vector/css/_common.scss
+++ b/src/skins/vector/css/_common.scss
@@ -266,12 +266,12 @@ textarea {
 
 ::-moz-selection {
     background-color: $accent-color;
-    color: white;
+    color: $selection-fg-color;
 }
 
 ::selection {
     background-color: $accent-color;
-    color: white;
+    color: $selection-fg-color;
 }
 
 /** green button with rounded corners */
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index 919b9f9b6b..d1aeddec34 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -46,7 +46,7 @@ limitations under the License.
     border-top-left-radius: 10px;
     border-top-right-radius: 10px;
 
-    background-color: rgba(255, 255, 255, 0.9);
+    background-color: $droptarget-bg-color;
     border: 2px #e1dddd solid;
     border-bottom: none;
     position: absolute;
diff --git a/src/skins/vector/css/themes/_base.scss b/src/skins/vector/css/themes/_base.scss
index 4f47df64e5..6488794d6c 100644
--- a/src/skins/vector/css/themes/_base.scss
+++ b/src/skins/vector/css/themes/_base.scss
@@ -13,6 +13,8 @@ $focus-bg-color: #dddddd;
 $accent-fg-color: #ffffff;
 $accent-color: #76CFA6;
 
+$selection-fg-color: $primary-bg-color;
+
 // red warning colour
 $warning-color: #ff0064;
 
diff --git a/src/skins/vector/css/themes/_dark.scss b/src/skins/vector/css/themes/_dark.scss
index 28b80a2034..62e89a7bfb 100644
--- a/src/skins/vector/css/themes/_dark.scss
+++ b/src/skins/vector/css/themes/_dark.scss
@@ -13,6 +13,8 @@ $light-fg-color: #747474;
 $accent-fg-color: $primary-bg-color;
 $accent-color: #76CFA6;
 
+$selection-fg-color: $primary-bg-color;
+
 // red warning colour
 $warning-color: #ff0064;
 
diff --git a/src/skins/vector/css/vector-web/structures/_RightPanel.scss b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
index 96e8698bdf..91034e633d 100644
--- a/src/skins/vector/css/vector-web/structures/_RightPanel.scss
+++ b/src/skins/vector/css/vector-web/structures/_RightPanel.scss
@@ -58,7 +58,8 @@ limitations under the License.
     width: 25px;
     height: 5px;
     border-radius: 5px;
-    background-color: rgba(118, 207, 166, 0.2);
+    background-color: $accent-color;
+    opacity: 0.2;
 }
 
 .mx_RightPanel_headerButton_badge {
diff --git a/src/skins/vector/css/vector-web/structures/_RoomDirectory.scss b/src/skins/vector/css/vector-web/structures/_RoomDirectory.scss
index 8c8ceeaf20..6e508ec78f 100644
--- a/src/skins/vector/css/vector-web/structures/_RoomDirectory.scss
+++ b/src/skins/vector/css/vector-web/structures/_RoomDirectory.scss
@@ -101,7 +101,7 @@ limitations under the License.
     text-transform: uppercase;
     font-weight: 600;
     font-size: 11px;
-    color: $accent-fg-color;
+    color: $accent-color;
 }
 
 .mx_RoomDirectory_topic {