Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ gem "bootsnap", require: false
gem "importmap-rails"
gem "propshaft"
gem "tailwindcss-rails"
gem "lucide-rails", github: "maybe-finance/lucide-rails"
gem "lucide-rails", github: "heyvito/lucide-rails"

# Hotwire + UI
gem "stimulus-rails"
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
GIT
remote: https://github.com/maybe-finance/lucide-rails.git
revision: 272e5fb8418ea458da3995d6abe0ba0ceee9c9f0
remote: https://github.com/heyvito/lucide-rails.git
revision: b56d0ffee924450dabc5a857b12af654921ba906
specs:
lucide-rails (0.2.0)
lucide-rails (0.7.1)
railties (>= 4.1.0)

GEM
Expand Down
2 changes: 1 addition & 1 deletion app/components/DS/filled_icon.rb
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def size_classes
end

def radius_classes
rounded ? "rounded-full" : SIZES[size][:container_radius]
rounded ? "rounded-sm" : SIZES[size][:container_radius]
end

def custom_fg_color
Expand Down
2 changes: 1 addition & 1 deletion app/views/categories/_color_avatar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<span
data-category-target="avatar"
class="w-14 h-14 flex items-center justify-center rounded-full"
class="w-14 h-14 flex items-center justify-center rounded-sm"
style="background-color: color-mix(in oklab, <%= category.color %> 10%, transparent); color: <%= category.color %>">
<%= icon(category.lucide_icon, size: "2xl", color: "current") %>
</span>
4 changes: 2 additions & 2 deletions app/views/family_merchants/_family_merchant.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<div class="flex justify-between items-center p-4 bg-container">
<div class="flex w-full items-center gap-2.5">
<% if family_merchant.logo_url %>
<div class="w-8 h-8 rounded-full flex justify-center items-center">
<%= image_tag family_merchant.logo_url, class: "w-8 h-8 rounded-full" %>
<div class="w-8 h-8 rounded-sm flex justify-center items-center">
<%= image_tag family_merchant.logo_url, class: "w-8 h-8 rounded-sm" %>
</div>
<% else %>
<%= render partial: "shared/color_avatar", locals: { name: family_merchant.name, color: family_merchant.color } %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/family_merchants/_form.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<% FamilyMerchant::COLORS.each do |color| %>
<label class="relative">
<%= f.radio_button :color, color, class: "sr-only peer", data: { action: "change->color-avatar#handleColorChange" } %>
<div class="w-6 h-6 rounded-full cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>
<div class="w-6 h-6 rounded-sm cursor-pointer peer-checked:ring-2 peer-checked:ring-offset-2 peer-checked:ring-blue-500" style="background-color: <%= color %>"></div>
</label>
<% end %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_color_avatar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<% background_color = "color-mix(in srgb, #{color} 5%, white)" %>
<% border_color = "color-mix(in srgb, #{color} 10%, white)" %>
<span data-color-avatar-target="avatar"
class="w-8 h-8 flex items-center justify-center rounded-full"
class="w-8 h-8 flex items-center justify-center rounded-sm"
style="background-color: <%= background_color %>; border-color: <%= border_color %>; color: <%= color %>">
<%= letter.upcase %>
</span>
2 changes: 1 addition & 1 deletion app/views/shared/_pagination.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</div>
<div class="flex items-center gap-4">
<%= select_tag :per_page,
options_for_select(["10", "20", "30", "50"], pagy.limit),
options_for_select(["10", "20", "30", "50", "100", "200"], pagy.limit),
data: { controller: "selectable-link" },
class: "py-1.5 pr-8 text-sm text-primary font-medium bg-container-inset border border-secondary rounded-lg focus:border-secondary focus:ring-secondary focus-visible:ring-secondary" %>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/transactions/_transaction.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<%= content_tag :div, class: ["flex items-center gap-2"] do %>
<% if transaction.merchant&.logo_url.present? %>
<%= image_tag transaction.merchant.logo_url,
class: "w-6 h-6 rounded-full",
class: "w-6 h-6 rounded-sm",
loading: "lazy" %>
<% else %>
<%= render DS::FilledIcon.new(
Expand Down