Fixed some colouring

fredagscafeen · Jul 19, 2024 · fefa94d · fefa94d
1 parent 792c44e
commit fefa94d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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