From 30756ad4aa844ce33923540e16c4251051c20af0 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Fri, 19 Apr 2024 11:09:31 +0200 Subject: [PATCH 01/10] [TASK] improve styling --- frontend/scss/app.scss | 1 + frontend/scss/components/_notification.scss | 5 ++++ templates/includes/macros.html.tera | 27 ++++++++++++--------- 3 files changed, 22 insertions(+), 11 deletions(-) create mode 100644 frontend/scss/components/_notification.scss diff --git a/frontend/scss/app.scss b/frontend/scss/app.scss index 770dc11..02e94d7 100644 --- a/frontend/scss/app.scss +++ b/frontend/scss/app.scss @@ -13,3 +13,4 @@ @import 'components/search'; @import 'components/important'; @import 'components/searchable-table'; +@import 'components/notification'; diff --git a/frontend/scss/components/_notification.scss b/frontend/scss/components/_notification.scss new file mode 100644 index 0000000..0532299 --- /dev/null +++ b/frontend/scss/components/_notification.scss @@ -0,0 +1,5 @@ +.notification { + right: -.2rem; + top: -.1rem; + font-size: .5rem; +} diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index ba3c29c..30283e3 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -28,20 +28,25 @@
From c528b8831ae92b9c82bb7def666ee83852b985d6 Mon Sep 17 00:00:00 2001 From: Marie Birner Date: Fri, 19 Apr 2024 11:25:25 +0200 Subject: [PATCH 02/10] [TASK] finalize notification styling --- templates/includes/macros.html.tera | 38 ++++++++++++++--------------- templates/index.html.tera | 10 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/templates/includes/macros.html.tera b/templates/includes/macros.html.tera index 30283e3..59660f2 100644 --- a/templates/includes/macros.html.tera +++ b/templates/includes/macros.html.tera @@ -28,29 +28,29 @@
-
+
+ {% if loggedin_user.amount_unread_notifications > 0 %} + + + + {{ loggedin_user.amount_unread_notifications }} + + + {% endif %} -

Ruderassistent

+

Ruderassistent

-