From 3467e0274885fe0da425079858bfc838c00f87f7 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 9 Nov 2023 19:37:46 +0100 Subject: [PATCH 1/4] [BUGFIX] color label dark-mode --- templates/includes/macros.html.tera | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index cc797e7..f2c5071 100644 --- a/templates/includes/macros.html.tera +++ b/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='') %}
- +
{% endmacro input %} From 609483f1df175117a7fe4bc9ec4e80fedd2ca324 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 9 Nov 2023 19:40:41 +0100 Subject: [PATCH 2/4] [BUGFIX] color text and btn dark-mode --- frontend/scss/components/_btns.scss | 2 +- templates/kiosk.html.tera | 2 +- templates/log.html.tera | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frontend/scss/components/_btns.scss b/frontend/scss/components/_btns.scss index 4fca153..5691039 100644 --- a/frontend/scss/components/_btns.scss +++ b/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 { diff --git a/templates/kiosk.html.tera b/templates/kiosk.html.tera index 321e7ca..7be754b 100644 --- a/templates/kiosk.html.tera +++ b/templates/kiosk.html.tera @@ -37,7 +37,7 @@ {{ log::show(log=log, state="on_water", allowed_to_close=true, only_ones=false) }} {% endfor %} {% else %} -

Kein Boot am Wasser

+

Kein Boot am Wasser

{% endif %} diff --git a/templates/log.html.tera b/templates/log.html.tera index dab1c77..24d54ee 100644 --- a/templates/log.html.tera +++ b/templates/log.html.tera @@ -39,7 +39,7 @@ {% endif %} {% endfor %} {% else %} -

Kein Boot am Wasser

+

Kein Boot am Wasser

{% endif %} From 8c5fbfec630676d660e54bc9564a9f89e5314597 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 9 Nov 2023 21:02:21 +0100 Subject: [PATCH 3/4] [BUGFIX] filter issues --- frontend/scss/components/_important.scss | 4 ++++ frontend/tailwind.config.cjs | 1 - templates/index.html.tera | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 frontend/scss/components/_important.scss diff --git a/frontend/scss/components/_important.scss b/frontend/scss/components/_important.scss new file mode 100644 index 0000000..7d2e869 --- /dev/null +++ b/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; +} diff --git a/frontend/tailwind.config.cjs b/frontend/tailwind.config.cjs index bf9ec7b..3510e01 100644 --- a/frontend/tailwind.config.cjs +++ b/frontend/tailwind.config.cjs @@ -40,7 +40,6 @@ export default { }, }, plugins: [], - important: true, darkMode: 'class', } diff --git a/templates/index.html.tera b/templates/index.html.tera index 8827b93..6968066 100644 --- a/templates/index.html.tera +++ b/templates/index.html.tera @@ -118,7 +118,7 @@ {% if loggedin_user.is_admin %}
{{ macros::input(label='Gast', class="input rounded-t", name='user_note', type='text', required=true) }} - +
{% endif %} @@ -217,7 +217,7 @@ {% if trip.cox_id == loggedin_user.id %}
{{ macros::input(label='Gast', class="input rounded-t", name='user_note', type='text', required=true) }} - +
{% endif %} {% endif %} From d7eb4faf035a4854ccf6bf5a964ef7acc8085e71 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Thu, 9 Nov 2023 21:22:55 +0100 Subject: [PATCH 4/4] [BUGFIX] filter issues --- frontend/scss/app.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/scss/app.scss b/frontend/scss/app.scss index b4bb35b..d3d9784 100644 --- a/frontend/scss/app.scss +++ b/frontend/scss/app.scss @@ -11,3 +11,4 @@ @import 'components/status'; @import 'components/chart'; @import 'components/search'; +@import 'components/important';