From e4d07c94d475bd3b70004e3d5ae5964072731c40 Mon Sep 17 00:00:00 2001 From: Herculino Trotta Date: Sun, 15 Jun 2025 10:58:57 -0300 Subject: [PATCH 1/6] style(theme): improve dark colors for a less washed out look --- frontend/src/styles/_variables.scss | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/styles/_variables.scss b/frontend/src/styles/_variables.scss index 592a695..ebcf0f6 100644 --- a/frontend/src/styles/_variables.scss +++ b/frontend/src/styles/_variables.scss @@ -35,3 +35,6 @@ $min-contrast-ratio: 1.9 !default; $nav-pills-link-active-color: $gray-900; $dropdown-link-active-color: $gray-900; + +$body-bg-dark: #1e1f24 !default; +$body-tertiary-bg-dark: #232429 !default; From f9056c3a4569c0a8e1d612d022a38b403a5b100e Mon Sep 17 00:00:00 2001 From: Herculino Trotta Date: Sun, 15 Jun 2025 15:44:33 -0300 Subject: [PATCH 2/6] feat: replace action row with a FAB --- .../calendar_view/pages/calendar.html | 74 ++++----- app/templates/cotton/components/fab.html | 33 ++++ .../cotton/components/fab_menu_button.html | 11 ++ app/templates/cotton/ui/transactions_fab.html | 53 +++++++ app/templates/includes/toasts.html | 3 +- .../monthly_overview/pages/overview.html | 20 ++- .../pages/overview_by_account.html | 143 +++++++++--------- .../pages/overview_by_currency.html | 143 +++++++++--------- 8 files changed, 294 insertions(+), 186 deletions(-) create mode 100644 app/templates/cotton/components/fab.html create mode 100644 app/templates/cotton/components/fab_menu_button.html create mode 100644 app/templates/cotton/ui/transactions_fab.html diff --git a/app/templates/calendar_view/pages/calendar.html b/app/templates/calendar_view/pages/calendar.html index 8521bc6..5f8e01a 100644 --- a/app/templates/calendar_view/pages/calendar.html +++ b/app/templates/calendar_view/pages/calendar.html @@ -13,45 +13,47 @@ {% endblock %} {% block content %} -
-
-{# Date picker#} -
-
- +
+
+ {# Date picker#} +
+
+ +
+
+ {{ month|month_name }} {{ year }} +
+
+ + + +
-
- {{ month|month_name }} {{ year }} -
-
- - - + {# Action buttons#} +
+ {# #}
-{# Action buttons#} -
- +
+
-
-
-
-
+ {% endblock %} diff --git a/app/templates/cotton/components/fab.html b/app/templates/cotton/components/fab.html new file mode 100644 index 0000000..e25c177 --- /dev/null +++ b/app/templates/cotton/components/fab.html @@ -0,0 +1,33 @@ +
+
+ + + +
+
diff --git a/app/templates/cotton/components/fab_menu_button.html b/app/templates/cotton/components/fab_menu_button.html new file mode 100644 index 0000000..26e496b --- /dev/null +++ b/app/templates/cotton/components/fab_menu_button.html @@ -0,0 +1,11 @@ +{% load i18n %} +
+ +
diff --git a/app/templates/cotton/ui/transactions_fab.html b/app/templates/cotton/ui/transactions_fab.html new file mode 100644 index 0000000..a3f1f64 --- /dev/null +++ b/app/templates/cotton/ui/transactions_fab.html @@ -0,0 +1,53 @@ +{% load i18n %} + + + + + + + + + + + + + diff --git a/app/templates/includes/toasts.html b/app/templates/includes/toasts.html index 27349d0..7694cee 100644 --- a/app/templates/includes/toasts.html +++ b/app/templates/includes/toasts.html @@ -1,6 +1,5 @@
-
+
- diff --git a/app/templates/monthly_overview/pages/overview.html b/app/templates/monthly_overview/pages/overview.html index 9035af7..e3bc52b 100644 --- a/app/templates/monthly_overview/pages/overview.html +++ b/app/templates/monthly_overview/pages/overview.html @@ -44,12 +44,12 @@
{# Action buttons#} -
- -
+{#
#} +{# #} +{#
#}
{# Monthly summary#}
@@ -174,8 +174,9 @@