From 795d8e0f00e5bfa7bfdcc901c1d44b5f91dbc0ec Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 12 Nov 2018 12:15:13 +0100
Subject: [PATCH] More color fixes after switching to css properties

---
 css/converse.css     | 17 ++++++++++++++---
 sass/_core.scss      | 14 ++++++++++++++
 sass/_variables.scss |  9 ++++++---
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/css/converse.css b/css/converse.css
index ca84bca88..60efe3b99 100644
--- a/css/converse.css
+++ b/css/converse.css
@@ -9315,9 +9315,11 @@ readers do not read off random characters that represent icons */
   --chat-head-color-lighten-50-percent: #e7f7ee;
   --chat-head-text-color: white;
   --highlight-color: #DCF9F6;
-  --primary-color: #E7A151;
-  --secondary-color: #578EA9;
+  --primary-color: #578EA9;
+  --secondary-color: #E7A151;
   --warning-color: #D24E2B;
+  --primary-color-dark: #345566;
+  --secondary-color-dark: #D2842B;
   --light-background-color: #FCFDFD;
   --error-color: #A53214;
   --info-color: #1E9652;
@@ -9796,9 +9798,18 @@ body.reset {
     background: white; }
   #conversejs .activated {
     display: block !important; }
+  #conversejs .nav-pills .nav-link.active,
+  #conversejs .nav-pills .show > .nav-link {
+    background-color: var(--primary-color); }
+  #conversejs .list-group-item.active {
+    background-color: var(--primary-color); }
   #conversejs .btn-primary, #conversejs .button-primary, #conversejs .badge-primary {
     color: white;
-    background-color: var(--primary-color); }
+    background-color: var(--primary-color);
+    border-color: transparent; }
+    #conversejs .btn-primary:hover, #conversejs .button-primary:hover, #conversejs .badge-primary:hover {
+      background-color: var(--secondary-color-dark);
+      border-color: transparent; }
   #conversejs .btn-info, #conversejs .badge-info {
     color: white;
     background-color: var(--link-color); }
diff --git a/sass/_core.scss b/sass/_core.scss
index dd5b8f728..6543a4012 100644
--- a/sass/_core.scss
+++ b/sass/_core.scss
@@ -449,9 +449,23 @@ body.reset {
         display: block !important;
     }
 
+    .nav-pills .nav-link.active,
+    .nav-pills .show > .nav-link {
+        background-color: var(--primary-color);
+    }
+
+    .list-group-item.active {
+        background-color: var(--primary-color);
+    }
+
     .btn-primary, .button-primary, .badge-primary {
         color: white;
         background-color: var(--primary-color);
+        border-color: transparent;
+        &:hover {
+            background-color: var(--secondary-color-dark);
+            border-color: transparent;
+        }
     }
     .btn-info, .badge-info {
         color: white;
diff --git a/sass/_variables.scss b/sass/_variables.scss
index 89e394221..769594105 100644
--- a/sass/_variables.scss
+++ b/sass/_variables.scss
@@ -47,9 +47,12 @@ $font-path: "webfonts/icomoon/fonts/" !default;
 
     --highlight-color: #DCF9F6;
 
-    --primary-color: #E7A151; // $orange
-    --secondary-color: #578EA9; // $light-blue
-    --warning-color: #D24E2B; // $dark-red
+    --primary-color: #578EA9; // light-blue
+    --secondary-color: #E7A151; // orange
+    --warning-color: #D24E2B; // dark-red
+
+    --primary-color-dark: #345566; // dark blue
+    --secondary-color-dark: #D2842B; // dark orange
 
     --light-background-color: #FCFDFD;