From 0328919b6ebb0fbfca4d232f9a11368c664dcf86 Mon Sep 17 00:00:00 2001 From: hatz Date: Wed, 14 May 2025 20:39:16 -0500 Subject: [PATCH] Standardize & improve a bunch of corners, fix some backgrounds, fix merchants for dark mode --- app/views/accounts/index/_account_groups.erb | 2 +- app/views/accounts/show/_activity.html.erb | 14 ++++++-------- app/views/categories/_category_list_group.html.erb | 4 ++-- app/views/entries/_entry_group.html.erb | 2 +- .../family_merchants/_family_merchant.html.erb | 2 +- app/views/family_merchants/index.html.erb | 4 ++-- app/views/pages/dashboard/_balance_sheet.html.erb | 9 +++++---- app/views/rules/index.html.erb | 2 +- app/views/settings/profiles/show.html.erb | 2 +- app/views/tags/index.html.erb | 4 ++-- 10 files changed, 22 insertions(+), 23 deletions(-) diff --git a/app/views/accounts/index/_account_groups.erb b/app/views/accounts/index/_account_groups.erb index 6347339c..8192c1ab 100644 --- a/app/views/accounts/index/_account_groups.erb +++ b/app/views/accounts/index/_account_groups.erb @@ -8,7 +8,7 @@

<%= accounts.count %>

<%= totals_by_currency(collection: accounts, money_method: :balance_money) %>

-
+
<% accounts.each do |account| %> <%= render account %> <% end %> diff --git a/app/views/accounts/show/_activity.html.erb b/app/views/accounts/show/_activity.html.erb index 704c6789..ab65dd4c 100644 --- a/app/views/accounts/show/_activity.html.erb +++ b/app/views/accounts/show/_activity.html.erb @@ -75,16 +75,14 @@
-
-
- <% calculator = Balance::TrendCalculator.new(@account.balances) %> +
+ <% calculator = Balance::TrendCalculator.new(@account.balances) %> - <%= entries_by_date(@entries) do |entries| %> - <% entries.each_with_index do |entry, index| %> - <%= render entry, balance_trend: index == 0 ? calculator.trend_for(entry.date) : nil, view_ctx: "account" %> - <% end %> + <%= entries_by_date(@entries) do |entries| %> + <% entries.each_with_index do |entry, index| %> + <%= render entry, balance_trend: index == 0 ? calculator.trend_for(entry.date) : nil, view_ctx: "account" %> <% end %> -
+ <% end %>
diff --git a/app/views/categories/_category_list_group.html.erb b/app/views/categories/_category_list_group.html.erb index e7337e45..17482848 100644 --- a/app/views/categories/_category_list_group.html.erb +++ b/app/views/categories/_category_list_group.html.erb @@ -7,8 +7,8 @@

<%= categories.count %>

-
-
+
+
<% Category::Group.for(categories).each_with_index do |group, idx| %> <%= render group.category %> diff --git a/app/views/entries/_entry_group.html.erb b/app/views/entries/_entry_group.html.erb index 36aeb27a..2ee8954c 100644 --- a/app/views/entries/_entry_group.html.erb +++ b/app/views/entries/_entry_group.html.erb @@ -21,7 +21,7 @@
<% end %>
-
+
<%= content %>
diff --git a/app/views/family_merchants/_family_merchant.html.erb b/app/views/family_merchants/_family_merchant.html.erb index f47d64c9..7614699c 100644 --- a/app/views/family_merchants/_family_merchant.html.erb +++ b/app/views/family_merchants/_family_merchant.html.erb @@ -1,6 +1,6 @@ <%# locals: (family_merchant:) %> -
+
<% if family_merchant.logo_url %>
diff --git a/app/views/family_merchants/index.html.erb b/app/views/family_merchants/index.html.erb index e54fc02c..64f6cac0 100644 --- a/app/views/family_merchants/index.html.erb +++ b/app/views/family_merchants/index.html.erb @@ -18,8 +18,8 @@

<%= @merchants.count %>

-
-
+
+
<%= render partial: "family_merchants/family_merchant", collection: @merchants, spacer_template: "shared/ruler" %>
diff --git a/app/views/pages/dashboard/_balance_sheet.html.erb b/app/views/pages/dashboard/_balance_sheet.html.erb index b759e04e..3c853970 100644 --- a/app/views/pages/dashboard/_balance_sheet.html.erb +++ b/app/views/pages/dashboard/_balance_sheet.html.erb @@ -27,6 +27,7 @@

<%= account_group.name %>

+ ·

<%= number_to_percentage(account_group.weight, precision: 0) %>

<% end %> @@ -46,10 +47,10 @@
-
+
<% classification_group.account_groups.each do |account_group| %> -
- +
+
<%= icon("chevron-right", class: "group-open:rotate-90") %> @@ -69,7 +70,7 @@
<% account_group.accounts.each_with_index do |account, idx| %> -
+
<%= render "accounts/logo", account: account, size: "sm", color: account_group.color %> diff --git a/app/views/rules/index.html.erb b/app/views/rules/index.html.erb index 59961714..b8d0eef5 100644 --- a/app/views/rules/index.html.erb +++ b/app/views/rules/index.html.erb @@ -58,7 +58,7 @@
-
+
<%= render partial: "rule", collection: @rules, spacer_template: "shared/ruler" %>
diff --git a/app/views/settings/profiles/show.html.erb b/app/views/settings/profiles/show.html.erb index fa97c57e..0819252b 100644 --- a/app/views/settings/profiles/show.html.erb +++ b/app/views/settings/profiles/show.html.erb @@ -41,7 +41,7 @@

<%= Current.family.name %> · <%= Current.family.users.size %>

<% @users.each do |user| %> -
+
<%= render "settings/user_avatar", avatar_url: user.profile_image&.variant(:small)&.url, initials: user.initials %>
diff --git a/app/views/tags/index.html.erb b/app/views/tags/index.html.erb index cc4a8459..0fdaf0ec 100644 --- a/app/views/tags/index.html.erb +++ b/app/views/tags/index.html.erb @@ -33,8 +33,8 @@

<%= @tags.count %>

-
-
+
+
<%= render partial: @tags, spacer_template: "shared/ruler" %>