Ruderverein-Donau-Linz/rowt
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects Wiki Activity

Merge branch 'bugfix-label' into 'main'

Browse Source 
Bugfix Darkmode

See merge request PhilippHofer/rot!95
This commit is contained in:
PhilippHofer 2023-11-09 20:37:33 +00:00
commit dd436d3571
8 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
frontend/scss/app.scss
View File

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

2
frontend/scss/components/_btns.scss
View File

@ -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 {

4
frontend/scss/components/_important.scss Normal file
View File

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

1
frontend/tailwind.config.cjs
View File

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

2
templates/includes/macros.html.tera
View File

@ -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 %}

4
templates/index.html.tera
View File

@ -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 %}

2
templates/kiosk.html.tera
View File

@ -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>

2
templates/log.html.tera
View File

@ -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>