Skip to content

Commit 3772bc7

Browse files
Mihai-MunteanuadrianthedevPaul-Bob
authored
change icons from world to world-map and from outline/school into fil… (#4367)
* change icons from world to world-map and from outline/school into filled/school * fix text * update gemfile.lock * test * modify test * test * fix cache * revert * appraisal --------- Co-authored-by: Adrian Marin <adrian@adrianthedev.com> Co-authored-by: Paul Bob <paul.ionut.bob@gmail.com>
1 parent 1d9a397 commit 3772bc7

12 files changed

Lines changed: 18 additions & 27 deletions

File tree

.github/workflows/feature-tests.yml

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,21 +60,12 @@ jobs:
6060
- name: Set up Ruby
6161
uses: ruby/setup-ruby@v1
6262
with:
63-
# bundler-cache: true
63+
bundler-cache: true
6464
bundler: default
6565
ruby-version: ${{ matrix.ruby }}
6666

67-
- uses: actions/cache@v4
68-
with:
69-
path: vendor/bundle
70-
key: ${{ runner.os }}-test-gems-${{ hashFiles('**/Gemfile.lock') }}
71-
restore-keys: |
72-
${{ runner.os }}-test-gems-${{ hashFiles('**/Gemfile.lock') }}
73-
74-
- name: Bundle install
67+
- name: Prepare database
7568
run: |
76-
bundle config path vendor/bundle
77-
bundle install --jobs 4 --retry 3
7869
bin/rails db:create
7970
bin/rails db:migrate
8071

Gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ PATH
77
activerecord (>= 6.1)
88
activesupport (>= 6.1)
99
addressable
10-
avo-icons (>= 0.1.1)
10+
avo-icons (>= 0.1.2)
1111
docile
1212
meta-tags
1313
pagy (>= 43.0)
@@ -177,7 +177,7 @@ GEM
177177
erubi (~> 1.4)
178178
parser (>= 2.4)
179179
smart_properties
180-
bigdecimal (4.0.1)
180+
bigdecimal (4.1.0)
181181
bindex (0.8.1)
182182
bootsnap (1.18.6)
183183
msgpack (~> 1.2)

avo.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,5 @@ Gem::Specification.new do |spec|
4646
spec.add_dependency "meta-tags"
4747
spec.add_dependency "docile"
4848
spec.add_dependency "prop_initializer", ">= 0.2.0"
49-
spec.add_dependency "avo-icons", ">= 0.1.1"
49+
spec.add_dependency "avo-icons", ">= 0.1.2"
5050
end

gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PATH
1212
activerecord (>= 6.1)
1313
activesupport (>= 6.1)
1414
addressable
15-
avo-icons (>= 0.1.1)
15+
avo-icons (>= 0.1.2)
1616
docile
1717
meta-tags
1818
pagy (>= 43.0)
@@ -131,7 +131,7 @@ GEM
131131
rake
132132
thor (>= 0.14.0)
133133
ast (2.4.3)
134-
avo-icons (0.1.1)
134+
avo-icons (0.1.2)
135135
inline_svg
136136
avo-money_field (0.0.5)
137137
money-rails (~> 1.12)

gemfiles/rails_7.1_ruby_3.4.5.gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PATH
1212
activerecord (>= 6.1)
1313
activesupport (>= 6.1)
1414
addressable
15-
avo-icons (>= 0.1.1)
15+
avo-icons (>= 0.1.2)
1616
docile
1717
meta-tags
1818
pagy (>= 43.0)
@@ -131,7 +131,7 @@ GEM
131131
rake
132132
thor (>= 0.14.0)
133133
ast (2.4.3)
134-
avo-icons (0.1.1)
134+
avo-icons (0.1.2)
135135
inline_svg
136136
avo-money_field (0.0.5)
137137
money-rails (~> 1.12)

gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PATH
1212
activerecord (>= 6.1)
1313
activesupport (>= 6.1)
1414
addressable
15-
avo-icons (>= 0.1.1)
15+
avo-icons (>= 0.1.2)
1616
docile
1717
meta-tags
1818
pagy (>= 43.0)
@@ -125,7 +125,7 @@ GEM
125125
rake
126126
thor (>= 0.14.0)
127127
ast (2.4.3)
128-
avo-icons (0.1.1)
128+
avo-icons (0.1.2)
129129
inline_svg
130130
avo-money_field (0.0.5)
131131
money-rails (~> 1.12)

gemfiles/rails_8.0_ruby_3.4.5.gemfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PATH
1212
activerecord (>= 6.1)
1313
activesupport (>= 6.1)
1414
addressable
15-
avo-icons (>= 0.1.1)
15+
avo-icons (>= 0.1.2)
1616
docile
1717
meta-tags
1818
pagy (>= 43.0)
@@ -125,7 +125,7 @@ GEM
125125
rake
126126
thor (>= 0.14.0)
127127
ast (2.4.3)
128-
avo-icons (0.1.1)
128+
avo-icons (0.1.2)
129129
inline_svg
130130
avo-money_field (0.0.5)
131131
money-rails (~> 1.12)

lib/generators/avo/resource_generator.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ def field(name, type)
356356
plan: "tabler/outline/list",
357357
address: "tabler/outline/map-pin",
358358
location: "tabler/outline/map-pin",
359-
country: "tabler/outline/world",
359+
country: "tabler/outline/world-map",
360360
city: "tabler/outline/building-community",
361361
account: "tabler/outline/user-circle",
362362
}.freeze

spec/dummy/app/avo/resources/user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def fields
7979
end
8080

8181
def actions
82-
action Avo::Actions::ToggleInactive, icon: "tabler/outline/world"
82+
action Avo::Actions::ToggleInactive, icon: "tabler/outline/world-map"
8383
action Avo::Actions::ToggleAdmin
8484
divider label: "Other actions"
8585
action Avo::Actions::Sub::DummyAction

spec/dummy/app/views/avo/resource_tools/_fish_information.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="flex flex-col">
22
<%= render ui.panel(title: @resource.record.name, description: "There should be an image of this fish below 🐠") do |panel| %>
33
<% panel.with_controls do %>
4-
<%= a_link('/admin', icon: 'tabler/outline/school', style: :primary) do %>
4+
<%= a_link('/admin', icon: 'tabler/filled/school', style: :primary) do %>
55
Primary
66
<% end %>
77
<% end %>

0 commit comments

Comments
 (0)