Merge branch 'bugfix-label' into 'main'

Bugfix Darkmode

See merge request PhilippHofer/rot!95

frontend/scss/app.scss

@@ -11,3 +11,4 @@
 @import 'components/status';
 @import 'components/chart';
 @import 'components/search';
+@import 'components/important';

frontend/scss/components/_btns.scss

@@ -10,7 +10,7 @@
   }
 
   &-gray {
-    @apply bg-gray-400 hover:bg-gray-500 dark:bg-primary-600 focus-visible:outline-primary-500;
+    @apply bg-gray-400 hover:bg-gray-500 focus-visible:outline-primary-500;
   }
 
   &-attention {

frontend/scss/components/_important.scss

@@ -0,0 +1,4 @@
+.rounded-t-none-important {
+    border-top-left-radius: 0px !important;
+    border-top-right-radius: 0px !important;
+}

frontend/tailwind.config.cjs

@@ -40,7 +40,6 @@ export default {
     },
   },
   plugins: [],
-  important: true,
   darkMode: 'class',
 }
 

templates/includes/macros.html.tera

@@ -152,7 +152,7 @@
 
 {% macro input(label, name, type, required=false, class='rounded-md', value='', min='', hide_label=false, id='', autofocus=false, wrapper_class='', pattern='') %}
 	<div class="{{wrapper_class}}">
-		<label for="{{ name }}" class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 {% endif %}">{{ label }}</label>
+		<label for="{{ name }}" class="{% if hide_label %} sr-only {% else %} text-sm text-gray-600 dark:text-white {% endif %}">{{ label }}</label>
 		<input {% if id %} id="{{ id }}" {% else %} id="{{ name }}" {% endif %} name="{{ name }}" type="{{ type }}" {% if required %} required {% endif %} value="{{ value }}" class="input {{ class }}" placeholder="{% if hide_label %}{{ label }}{% endif %}" {% if min is defined %} min="{{ min }}" {% endif %} {% if autofocus %} autofocus {% endif %}{% if pattern %}pattern="{{ pattern }}"{% endif %}>
 	</div>
 {% endmacro input %}

templates/index.html.tera

@@ -118,7 +118,7 @@
 													{% if loggedin_user.is_admin %}
 														<form action="/join/{{ planned_event.trip_details_id }}" method="get" />
 															{{ macros::input(label='Gast', class="input rounded-t", name='user_note', type='text', required=true) }}
-															<input value="Gast hinzufügen" class="btn btn-primary w-full !rounded-t-none" type="submit"/>
+															<input value="Gast hinzufügen" class="btn btn-primary w-full rounded-t-none-important" type="submit"/>
 														</form>
 													{% endif %}
 
@@ -217,7 +217,7 @@
 													{% if trip.cox_id == loggedin_user.id %}
 														<form action="/join/{{ trip.trip_details_id }}" method="get" />
 															{{ macros::input(label='Gast', class="input rounded-t", name='user_note', type='text', required=true) }}
-															<input value="Gast hinzufügen" class="btn btn-primary w-full !rounded-t-none" type="submit"/>
+															<input value="Gast hinzufügen" class="btn btn-primary w-full rounded-t-none-important" type="submit"/>
 														</form>
 													{% endif %}
 												{% endif %}

templates/kiosk.html.tera

@@ -37,7 +37,7 @@
             {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=false) }}
           {% endfor %}
         {% else %}
-          <p class="p-3 text-center">Kein Boot am Wasser</p>
+          <p class="p-3 text-center text-black dark:text-white">Kein Boot am Wasser</p>
         {% endif %}
       </div>
     </div>

templates/log.html.tera

@@ -39,7 +39,7 @@
 						{% endif %}
 					{% endfor %}
 				{% else %}
-					<p class="p-3 text-center">Kein Boot am Wasser</p>
+					<p class="p-3 text-center text-black dark:text-white">Kein Boot am Wasser</p>
 				{% endif %}
 			</div>
 		</div>