From fefa94ddc2e2a226025bb8c9eb9e4013698b2275 Mon Sep 17 00:00:00 2001
From: Anders Bruun Severinsen <202204885@post.au.dk>
Date: Fri, 19 Jul 2024 11:44:51 +0200
Subject: [PATCH] Fixed some colouring

---
 bartenders/templates/barplan.html     |  8 ++++----
 bartenders/templates/bartenders.html  |  4 ++--
 web/static/css/stylesheet.css         | 28 ++++++++++++++++-----------
 web/static/js/darkModeState.js        |  3 +--
 web/static/js/timesheet-black.min.css |  2 +-
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/bartenders/templates/barplan.html b/bartenders/templates/barplan.html
index 22300ca..b5b7414 100644
--- a/bartenders/templates/barplan.html
+++ b/bartenders/templates/barplan.html
@@ -27,15 +27,15 @@ <h2>{% translate "Barplan" %}</h2>
 	<tbody>
     {% for shift in bartendershifts %}
 		<tr>
-			<td {% if shift|is_with_user:user %}style="background-color: rgba(173, 216, 230, 0.462);"{% endif %}class="col-md-2">{{ shift.display_str }} {% if show_all %} {{ shift.start_datetime.year }}{% endif %}</td>
-            <td {% if shift|is_with_user:user %}style="background-color: rgba(173, 216, 230, 0.462);"{% endif %} class="col-md-3">{{ shift.responsible.name }}</td>
-            <td {% if shift|is_with_user:user %}style="background-color: rgba(173, 216, 230, 0.462);"{% endif %} class="col-md-7">
+			<td {% if shift|is_with_user:user %}style="background-color: skyblue;"{% endif %}class="col-md-2">{{ shift.display_str }} {% if show_all %} {{ shift.start_datetime.year }}{% endif %}</td>
+            <td {% if shift|is_with_user:user %}style="background-color: skyblue;"{% endif %} class="col-md-3">{{ shift.responsible.name }}</td>
+            <td {% if shift|is_with_user:user %}style="background-color: skyblue;"{% endif %} class="col-md-7">
                 {% for bartender in shift.other_bartenders.all %}
 					{% if bartender.first_bartender_shift == shift %}<b title="{% translate "Bartender's first shift" %}">{{ bartender.name }}</b>{% else %}{{ bartender.name }}{% endif %}{% if not forloop.last %},{% endif %}
                 {% endfor %}
             </td>
 			{% if user.is_staff %}
-				<td {% if shift|is_with_user:user %}style="background-color: rgba(173, 216, 230, 0.462);"{% endif %} class="hidden-xs col-md-1"><a href="/admin/bartenders/bartendershift/{{ shift.id }}">{% translate "Edit" %}</a></td>
+				<td {% if shift|is_with_user:user %}style="background-color: skyblue;"{% endif %} class="hidden-xs col-md-1"><a href="/admin/bartenders/bartendershift/{{ shift.id }}">{% translate "Edit" %}</a></td>
 			{% endif %}
 		</tr>
 	{% endfor %}
diff --git a/bartenders/templates/bartenders.html b/bartenders/templates/bartenders.html
index b101ec8..3099d45 100644
--- a/bartenders/templates/bartenders.html
+++ b/bartenders/templates/bartenders.html
@@ -9,7 +9,7 @@ <h2>{% translate "Bartendere" %}</h2>
 	<div class="col-md-6">
 
 		<ul class="list-group">
-			<li class="list-group-item  list-group-item-success"><b>{% translate "Nuværende" %} ({{ bartenders.count }})</b></li>
+			<li class="list-group-item  list-group-item-info"><b>{% translate "Nuværende" %} ({{ bartenders.count }})</b></li>
 			{% for bartender in bartenders %}
 				<li class="list-group-item">{{ bartender.name }} (<code>{{ bartender.username }}</code>)</li>
 			{% endfor %}
@@ -20,7 +20,7 @@ <h2>{% translate "Bartendere" %}</h2>
 	<div class="col-md-6">
 
 		<ul class="list-group">
-			<li class="list-group-item  list-group-item-warning"><b>{% translate "Tidligere" %} ({{ inactive_bartenders.count }})</b></li>
+			<li class="list-group-item  list-group-item-danger"><b>{% translate "Tidligere" %} ({{ inactive_bartenders.count }})</b></li>
 			{% for bartender in inactive_bartenders %}
 				<li class="list-group-item">{{ bartender.name }} (<code>{{ bartender.username }}</code>)</li>
 			{% endfor %}
diff --git a/web/static/css/stylesheet.css b/web/static/css/stylesheet.css
index 018d584..158360f 100755
--- a/web/static/css/stylesheet.css
+++ b/web/static/css/stylesheet.css
@@ -245,14 +245,20 @@ html.dark {
         background-color: #351b1b;
     }
 
-    input, textarea, select, .input-group-addon, .panel, select, th, .dropdown.open {
+    input, textarea, select, .input-group-addon, .panel, select, th {
         background-color: #282828;
         border-color: #282828;
         color: #EEEEEE;
     }
 
-    .dropdown.open {
-        background-color: black !important;
+    .navbar-default .navbar-nav .open .dropdown-menu>li>a, .navbar-default .navbar-nav .open .dropdown-menu {
+        background-color: #282828;
+        color:#EEEEEE;
+    }
+
+    .navbar-default .navbar-nav .open .dropdown-menu>li>a:hover {
+        background-color: #151515;
+        color: #4d4d4d;
     }
 
     select:disabled, input:disabled {
@@ -273,19 +279,19 @@ html.dark {
         border-color: #4d4d4d;
     }
 
-    .list-group-item-success {
-        background-color: #3C763D;
+    .list-group-item-info {
+        background-color: var(--datblue);
     }
-    .list-group-item-success > b {
-        color: #DFF0D8;
+    .list-group-item-info > b {
+        color: #D9EDF7;
     }
 
-    .list-group-item-warning {
-        background-color: #8A6D3B;
+    .list-group-item-danger {
+        background-color: #854040;
     }
 
-    .list-group-item-warning > b {
-        color: #FCF8E3;
+    .list-group-item-danger > b {
+        color: #F2DEDE;
     }
 
     .success-dark {
diff --git a/web/static/js/darkModeState.js b/web/static/js/darkModeState.js
index db9a89d..5226c6e 100644
--- a/web/static/js/darkModeState.js
+++ b/web/static/js/darkModeState.js
@@ -25,13 +25,12 @@ function switchTheme() {
         for (let i = 0; i < panels.length; i++) {
             panels[i].classList = "panel panel-primary";
         }
-        const success = document.getElementsByClassName("success");
         for (let n = 0; n < 5; n++) {
+            const success = document.getElementsByClassName("success");
             for (let i = 0; i < success.length; i++) {
                 success[i].classList = "success-dark";
             }
         }
-        const danger = document.getElementsByClassName("danger");
         for (let n = 0; n < 5; n++) {
             const danger = document.getElementsByClassName("danger");
             for (let i = 0; i < danger.length; i++) {
diff --git a/web/static/js/timesheet-black.min.css b/web/static/js/timesheet-black.min.css
index 954479c..9078802 100644
--- a/web/static/js/timesheet-black.min.css
+++ b/web/static/js/timesheet-black.min.css
@@ -1,2 +1,2 @@
-.black .timesheet{width:720px;height:292px;margin:0 auto}.black .timesheet{border-top:1px solid rgba(203, 203, 203, 0.759);background-color:#282828;position:relative}.black .timesheet.color-scheme-default .bubble-default{background-color:RGBA(252, 70, 74, 1)}.black .timesheet.color-scheme-default .bubble-lorem{background-color:RGBA(154, 202, 39, 1)}.black .timesheet.color-scheme-default .bubble-ipsum{background-color:RGBA(60, 182, 227, 1)}.black .timesheet.color-scheme-default .bubble-dolor{background-color:RGBA(244, 207, 48, 1)}.black .timesheet.color-scheme-default .bubble-sit{background-color:RGBA(169, 105, 202, 1)}.black .timesheet.color-scheme-alternative .bubble-default{background-color:#f3552e}.black .timesheet.color-scheme-alternative .bubble-lorem{background-color:#88c33a}.black .timesheet.color-scheme-alternative .bubble-ipsum{background-color:#436ae0}.black .timesheet.color-scheme-alternative .bubble-dolor{background-color:#f4d234}.black .timesheet.color-scheme-alternative .bubble-sit{background-color:#707d86}.black .timesheet .scale{height:100%;position:absolute;top:0;left:0;float:left}.black .timesheet .scale section{float:left;width:59px;color:rgba(203, 203, 203, 0.715);font-family:"Signika Negative";font-size:13px;line-height:24px;font-weight:300;border-left:1px dashed rgba(50,50,50,0.1);height:100%}.black .timesheet .data{margin:28px 0 0 0;padding:0;text-align:left;list-style-type:none;color:rgba(250,250,250,0.8);font-family:"Signika Negative";font-size:13px;overflow:hidden}.black .timesheet .data li{margin:0 0 3px 0;line-height:22px;height:21px;display:block;cursor:pointer;clear:both;position:relative;black-space:nowrap}.black .timesheet .data li:hover .bubble{opacity:1}.black .timesheet .data li .date{color:#797979;font-size:14px}.black .timesheet .data li .label{font-weight:lighter;font-size:14px;padding-left:5px;line-height:21px;color:#d7d7d7;black-space:nowrap}.black .timesheet .data li .bubble{width:24px;height:7px;display:block;float:left;position:relative;top:7px;border-radius:4px;margin:0 10px 0 0;opacity:0.7}
+.black .timesheet{width:720px;height:292px;margin:0 auto}.black .timesheet{border-top:1px solid rgba(203, 203, 203, 0.759);background-color:#282828;position:relative}.black .timesheet.color-scheme-default .bubble-default{background-color:RGBA(252, 70, 74, 1)}.black .timesheet.color-scheme-default .bubble-lorem{background-color:RGBA(154, 202, 39, 1)}.black .timesheet.color-scheme-default .bubble-ipsum{background-color:RGBA(60, 182, 227, 1)}.black .timesheet.color-scheme-default .bubble-dolor{background-color:RGBA(244, 207, 48, 1)}.black .timesheet.color-scheme-default .bubble-sit{background-color:RGBA(169, 105, 202, 1)}.black .timesheet.color-scheme-alternative .bubble-default{background-color:#f3552e}.black .timesheet.color-scheme-alternative .bubble-lorem{background-color:#88c33a}.black .timesheet.color-scheme-alternative .bubble-ipsum{background-color:#436ae0}.black .timesheet.color-scheme-alternative .bubble-dolor{background-color:#f4d234}.black .timesheet.color-scheme-alternative .bubble-sit{background-color:#707d86}.black .timesheet .scale{height:100%;position:absolute;top:0;left:0;float:left}.black .timesheet .scale section{float:left;width:59px;color:rgba(203, 203, 203, 0.715);font-family:"Signika Negative";font-size:13px;line-height:24px;font-weight:300;border-left:1px dashed rgba(203, 203, 203, 0.329);height:100%}.black .timesheet .data{margin:28px 0 0 0;padding:0;text-align:left;list-style-type:none;color:rgba(250,250,250,0.8);font-family:"Signika Negative";font-size:13px;overflow:hidden}.black .timesheet .data li{margin:0 0 3px 0;line-height:22px;height:21px;display:block;cursor:pointer;clear:both;position:relative;black-space:nowrap}.black .timesheet .data li:hover .bubble{opacity:1}.black .timesheet .data li .date{color:#797979;font-size:14px}.black .timesheet .data li .label{font-weight:lighter;font-size:14px;padding-left:5px;line-height:21px;color:#d7d7d7;black-space:nowrap}.black .timesheet .data li .bubble{width:24px;height:7px;display:block;float:left;position:relative;top:7px;border-radius:4px;margin:0 10px 0 0;opacity:0.7}
 /*# sourceMappingURL=timesheet-black.min.css.map */