From 11f7e759fc1982b2fb7d91032ec0923528d64d63 Mon Sep 17 00:00:00 2001
From: Marius <gilberg@gmail.com>
Date: Sat, 17 Oct 2020 11:41:04 +0200
Subject: [PATCH] duplcacy: changed org-dark txt color, and btn fix

---
 CSS/themes/duplicacy/aquamarine.css     |  1 +
 CSS/themes/duplicacy/dark.css           |  1 +
 CSS/themes/duplicacy/duplicacy-base.css | 42 +++++++++++++++----------
 CSS/themes/duplicacy/hotline.css        |  1 +
 CSS/themes/duplicacy/organizr-dark.css  |  3 +-
 CSS/themes/duplicacy/plex.css           |  1 +
 CSS/themes/duplicacy/space-gray.css     |  1 +
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/CSS/themes/duplicacy/aquamarine.css b/CSS/themes/duplicacy/aquamarine.css
index 7e08e3a7..c8c67b9a 100644
--- a/CSS/themes/duplicacy/aquamarine.css
+++ b/CSS/themes/duplicacy/aquamarine.css
@@ -18,6 +18,7 @@
   --modal-bg-color: radial-gradient(ellipse at top, #47918a 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --button-color: #009688;
   --button-color-hover: #12afa0;
+  --button-text: #eee;
   --accent-color:  #12afa0;
   --accent-color-hover: #fff;
   --text: #eee;
diff --git a/CSS/themes/duplicacy/dark.css b/CSS/themes/duplicacy/dark.css
index 7d5c47f4..7de188a4 100644
--- a/CSS/themes/duplicacy/dark.css
+++ b/CSS/themes/duplicacy/dark.css
@@ -18,6 +18,7 @@
   --modal-bg-color: radial-gradient(circle , #3a3a3a, #2d2d2d, #202020, #141414, #000000) center center/cover no-repeat fixed;
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
   --accent-color:  #fff;
   --accent-color-hover: rgba(255, 255, 255, 0.45);
   --text: #eee;
diff --git a/CSS/themes/duplicacy/duplicacy-base.css b/CSS/themes/duplicacy/duplicacy-base.css
index 71488eaa..39bc9133 100644
--- a/CSS/themes/duplicacy/duplicacy-base.css
+++ b/CSS/themes/duplicacy/duplicacy-base.css
@@ -72,7 +72,8 @@ body,
 .card .stats,
 .vis-time-axis .vis-text,
 .footer .copyright,
-.navbar-default .navbar-brand {
+.navbar-default .navbar-brand,
+.sidebar .nav li > a, .off-canvas-sidebar .nav li > a {
     color: var(--text) !important;
 }
 
@@ -240,7 +241,10 @@ body,
 
 .sidebar[data-active-color="success"] .nav li.active>a,
 .off-canvas-sidebar[data-active-color="success"] .nav li.active>a {
-    color: var(--accent-color);
+    color: var(--accent-color) !important;
+}
+.sidebar .nav li > a:hover {
+    color: var(--text-hover) !important;
 }
 
 .sidebar .sidebar-wrapper {
@@ -350,7 +354,7 @@ fieldset[disabled] .form-control {
 
 /* BUTTONS */
 .btn {
-    color: var(--text);
+    color: var(--button-text);
     border-width: 1px;
     border-radius: 4px;
 }
@@ -376,7 +380,7 @@ fieldset[disabled] .form-control {
 }
 
 .btn-info.btn-fill {
-    color: var(--text);
+    color: var(--button-text);
     background-color: var(--button-color);
     border: var(--button-color);
 }
@@ -392,13 +396,13 @@ fieldset[disabled] .form-control {
 .btn-primary {
     border-color: var(--button-color);
     background: var(--button-color);
-    color: var(--text);
+    color: var(--button-text);
 }
 
-.btn-primary:focus {
-    border-color: var(--button-color);
-    color: var(--button-color);
-    background-color: transparent;
+.btn-primary:focus,.btn-primary:active:focus {
+    border-color: var(--button-color-hover);
+    color: var(--text-hover);
+    background-color: var(--button-color-hover);
 }
 
 .btn-primary:hover {
@@ -408,7 +412,7 @@ fieldset[disabled] .form-control {
 }
 
 .btn-primary.btn-fill {
-    color: var(--text);
+    color: var(--button-text);
     background-color: var(--button-color);
     border-color: var(--button-color);
 }
@@ -420,15 +424,20 @@ fieldset[disabled] .form-control {
 
 }
 
-div>div>div.modal-footer>button.btn.btn-default.pull-left {
+div>div>div.modal-footer>button.btn.btn-default.pull-left,
+.navbar .navbar-nav>li>a.btn-danger.btn-fill,
+.btn-danger.btn-fill {
     border-color: #f05050;
     background-color: #f05050;
-    color: var(--text);
+    color: var(--button-text);
 }
 
 div>div>div.modal-footer>button.btn.btn-default.pull-left:hover,
-.navbar .navbar-nav>li>a.btn-danger.btn-fill,
-.btn-danger.btn-fill {
+div>div>div.modal-footer>button.btn.btn-default.pull-left:focus,
+.navbar .navbar-nav>li>a.btn-danger.btn-fill:hover,
+.navbar .navbar-nav>li>a.btn-danger.btn-fill:focus,
+.btn-danger.btn-fill:hover,
+.btn-danger.btn-fill:focus {
     border-color: #ec2626;
     color: var(--text-hover);
     background-color: #ec2626;
@@ -436,10 +445,11 @@ div>div>div.modal-footer>button.btn.btn-default.pull-left:hover,
 div.bootbox.modal.fade.bootbox-confirm.in > div > div > div.modal-footer > button.btn.btn-default {
     border-color: #f05050;
     background-color: #f05050;
-    color: var(--text);
+    color: var(--button-text);
 }
 
-div.bootbox.modal.fade.bootbox-confirm.in > div > div > div.modal-footer > button.btn.btn-default:hover {
+div.bootbox.modal.fade.bootbox-confirm.in > div > div > div.modal-footer > button.btn.btn-default:hover,
+div.bootbox.modal.fade.bootbox-confirm.in > div > div > div.modal-footer > button.btn.btn-default:focus {
     border-color: #ec2626;
     color: var(--text-hover);
     background-color: #ec2626;
diff --git a/CSS/themes/duplicacy/hotline.css b/CSS/themes/duplicacy/hotline.css
index eaea39e2..dc14d1a1 100644
--- a/CSS/themes/duplicacy/hotline.css
+++ b/CSS/themes/duplicacy/hotline.css
@@ -18,6 +18,7 @@
   --modal-bg-color: radial-gradient(ellipse at top, #F44336 0%, #0b3161 100%) center center/cover no-repeat fixed;
   --button-color: hsla(0,0%,100%,.15);
   --button-color-hover: hsla(0,0%,100%,.30);
+  --button-text: #eee;
   --accent-color:  #F44336;
   --accent-color-hover: #0b3161;
   --text: #eee;
diff --git a/CSS/themes/duplicacy/organizr-dark.css b/CSS/themes/duplicacy/organizr-dark.css
index e7167798..109c1d62 100644
--- a/CSS/themes/duplicacy/organizr-dark.css
+++ b/CSS/themes/duplicacy/organizr-dark.css
@@ -18,9 +18,10 @@
   --modal-bg-color: #1b1b1b;
   --button-color: #2cabe3;
   --button-color-hover: rgb(44 171 227 / .8);
+  --button-text: #eee;
   --accent-color:#2cabe3;
   --accent-color-hover: #fff;
-  --text: #eee;
+  --text:#96a2b4;
   --text-hover: #fff;
   --link-color: #2cabe3;
 }
\ No newline at end of file
diff --git a/CSS/themes/duplicacy/plex.css b/CSS/themes/duplicacy/plex.css
index 3dbb7d40..df974982 100644
--- a/CSS/themes/duplicacy/plex.css
+++ b/CSS/themes/duplicacy/plex.css
@@ -18,6 +18,7 @@
   --modal-bg-color: url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/blur-noise.png"), url("https://raw.githubusercontent.com/gilbN/theme.park/master/Resources/preset-dark2.png") center center/cover no-repeat fixed;
   --button-color: #cc7b19;
   --button-color-hover: #e59029;
+  --button-text: #eee;
   --accent-color:  #e5a00d;
   --accent-color-hover: #ffc107;
   --text: #eee;
diff --git a/CSS/themes/duplicacy/space-gray.css b/CSS/themes/duplicacy/space-gray.css
index 87735b3c..b88c25ad 100644
--- a/CSS/themes/duplicacy/space-gray.css
+++ b/CSS/themes/duplicacy/space-gray.css
@@ -18,6 +18,7 @@
   --modal-bg-color: radial-gradient( ellipse at top,  rgba(87,108,117,1) 0%, rgba(37,50,55,1) 100.2% ) center center/cover no-repeat fixed; 
   --button-color: #607D8B;
   --button-color-hover: #81a6b7;
+  --button-text: #eee;
   --accent-color: #81a6b7;
   --accent-color-hover: #81a6b7;
   --text: #eee;