diff --git a/app/assets/tailwind/maybe-design-system.css b/app/assets/tailwind/maybe-design-system.css index 61a3de14..def88d4e 100644 --- a/app/assets/tailwind/maybe-design-system.css +++ b/app/assets/tailwind/maybe-design-system.css @@ -508,6 +508,10 @@ @apply transition-all duration-300; } + .btn--round { + @apply rounded-full p-2 sm:rounded-lg sm:px-3 sm:py-2 + } + .btn--primary { @apply button-bg-primary text-white disabled:text-gray-400; @apply hover:button-bg-primary-hover; diff --git a/app/helpers/forms_helper.rb b/app/helpers/forms_helper.rb index d2f6cb04..1ac7ae4d 100644 --- a/app/helpers/forms_helper.rb +++ b/app/helpers/forms_helper.rb @@ -31,8 +31,8 @@ end private def radio_tab_contents(label:, icon:) tag.div(class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued group-has-checked:bg-container group-has-checked:text-gray-800 group-has-checked:shadow-sm") do - concat lucide_icon(icon, class: "w-5 h-5") - concat tag.span(label, class: "group-has-checked:font-semibold") + concat lucide_icon(icon, class: "w-[clamp(15px,1.8vw,20px)] h-[clamp(15px,1.8vw,20px)]") + concat tag.span(label, class: "group-has-checked:font-semibold text-[clamp(14px,1.5vw,16px)]") end end end diff --git a/app/helpers/mfa_helper.rb b/app/helpers/mfa_helper.rb index f2d69ecc..741705c6 100644 --- a/app/helpers/mfa_helper.rb +++ b/app/helpers/mfa_helper.rb @@ -8,7 +8,7 @@ module MfaHelper svg_attributes: { width: "240", height: "240", - viewBox: "0 0 65 65" + viewBox: "0 0 60 60" } ) diff --git a/app/views/account/entries/_entry_group.html.erb b/app/views/account/entries/_entry_group.html.erb index 36aeb27a..d2930e25 100644 --- a/app/views/account/entries/_entry_group.html.erb +++ b/app/views/account/entries/_entry_group.html.erb @@ -1,6 +1,6 @@ <%# locals: (date:, entries:, content:, totals: false) %> -
+
<%= check_box_tag "#{date}_entries_selection", diff --git a/app/views/account/transactions/_form.html.erb b/app/views/account/transactions/_form.html.erb index 211738c5..8407bf9c 100644 --- a/app/views/account/transactions/_form.html.erb +++ b/app/views/account/transactions/_form.html.erb @@ -8,8 +8,8 @@
<%= radio_tab_tag form: f, name: :nature, value: :outflow, label: t(".expense"), icon: "minus-circle", checked: params[:nature] == "outflow" || params[:nature].nil? %> <%= radio_tab_tag form: f, name: :nature, value: :inflow, label: t(".income"), icon: "plus-circle", checked: params[:nature] == "inflow" %> - <%= link_to new_transfer_path, data: { turbo_frame: :modal }, class: "flex px-4 py-1 rounded-lg items-center space-x-2 justify-center text-subdued group-has-checked:bg-container group-has-checked:text-gray-800 group-has-checked:shadow-sm" do %> - <%= lucide_icon "arrow-right-left", class: "w-5 h-5" %> + <%= link_to new_transfer_path, data: { turbo_frame: :modal }, class: "flex px-4 py-1 text-[clamp(14px,1.5vw,16px)] rounded-lg items-center space-x-2 justify-center text-subdued group-has-checked:bg-container group-has-checked:text-gray-800 group-has-checked:shadow-sm" do %> + <%= lucide_icon "arrow-right-left", class: "w-[clamp(15px,1.8vw,20px)] h-[clamp(15px,1.8vw,20px)]" %> <%= tag.span t(".transfer") %> <% end %>
diff --git a/app/views/account/transactions/_transaction.html.erb b/app/views/account/transactions/_transaction.html.erb index 8d589733..3c6222dc 100644 --- a/app/views/account/transactions/_transaction.html.erb +++ b/app/views/account/transactions/_transaction.html.erb @@ -4,7 +4,7 @@ <%= turbo_frame_tag dom_id(entry) do %> <%= turbo_frame_tag dom_id(transaction) do %> -
"> diff --git a/app/views/accounts/_form.html.erb b/app/views/accounts/_form.html.erb index 2910879b..a11f5bcf 100644 --- a/app/views/accounts/_form.html.erb +++ b/app/views/accounts/_form.html.erb @@ -1,7 +1,7 @@ <%# locals: (account:, url:) %> -<%= styled_form_with model: account, url: url, scope: :account, data: { turbo: false }, class: "flex flex-col gap-4 justify-between grow" do |form| %> -
+<%= styled_form_with model: account, url: url, scope: :account, data: { turbo: false }, class: "flex flex-col gap-4 justify-between grow !max-w-[100%]" do |form| %> +
<%= form.hidden_field :accountable_type %> <%= form.hidden_field :return_to, value: params[:return_to] %> diff --git a/app/views/accounts/index.html.erb b/app/views/accounts/index.html.erb index 7d2eb4f7..1b34b3d8 100644 --- a/app/views/accounts/index.html.erb +++ b/app/views/accounts/index.html.erb @@ -4,17 +4,17 @@
<%= button_to sync_all_accounts_path, disabled: Current.family.syncing?, - class: "btn btn--outline flex items-center gap-2", + class: "btn btn--outline btn--round flex items-center gap-2", title: t(".sync") do %> <%= lucide_icon "refresh-cw", class: "w-5 h-5" %> - <%= t(".sync") %> + <% end %> <%= link_to new_account_path(return_to: accounts_path), data: { turbo_frame: "modal" }, - class: "btn btn--primary flex items-center gap-1" do %> + class: "btn btn--primary btn--round flex items-center gap-1" do %> <%= lucide_icon("plus", class: "w-5 h-5") %> -

<%= t(".new_account") %>

+ <% end %>
diff --git a/app/views/accounts/new/_container.html.erb b/app/views/accounts/new/_container.html.erb index ca4ce59d..976ab13e 100644 --- a/app/views/accounts/new/_container.html.erb +++ b/app/views/accounts/new/_container.html.erb @@ -19,7 +19,7 @@ <%= yield %>
-
+