Skip to content

Commit

Permalink
Merge branch 'main' into depfu/batch_all/yarn/2024-12-26
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul-Bob authored Dec 31, 2024
2 parents b10bd9e + 3f9f33f commit 016b52d
Show file tree
Hide file tree
Showing 8 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
avo (3.15.6)
avo (3.15.7)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
4 changes: 2 additions & 2 deletions app/components/avo/field_wrapper_component.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@
<% end %>
<% if on_edit? && @field.is_required? %> <span class="text-red-600 ml-1">*</span> <% end %>
<% end %>
<%= content_tag :div, class: class_names("flex-1 flex flex-row md:min-h-inherit px-6 overflow-x-auto",
<%= content_tag :div, class: class_names("flex-1 flex flex-row md:min-h-inherit px-6",
@field.get_html(:classes, view: @view, element: :content),
{
"pb-4": stacked?,
"py-2": !compact?,
"py-1": compact?,
}), data: {slot: "value"} do %>
<div class="self-center w-full break-words <% unless full_width? || compact? || stacked? %> md:w-8/12 has-sidebar:w-full <% end %>">
<div class="self-center w-full <% unless full_width? || compact? || stacked? %> md:w-8/12 has-sidebar:w-full <% end %>">
<% if on_show? %>
<div class="flex flex-row items-center group gap-x-1">
<% if render_dash? %>
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6.1_ruby_3.1.4.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PATH
PATH
remote: ..
specs:
avo (3.15.6)
avo (3.15.7)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_6.1_ruby_3.3.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PATH
PATH
remote: ..
specs:
avo (3.15.6)
avo (3.15.7)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.1_ruby_3.1.4.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PATH
PATH
remote: ..
specs:
avo (3.15.6)
avo (3.15.7)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_7.1_ruby_3.3.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PATH
PATH
remote: ..
specs:
avo (3.15.6)
avo (3.15.7)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails_8.0_ruby_3.3.0.gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PATH
PATH
remote: ..
specs:
avo (3.15.6)
avo (3.15.7)
actionview (>= 6.1)
active_link_to
activerecord (>= 6.1)
Expand Down
2 changes: 1 addition & 1 deletion lib/avo/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module Avo
VERSION = "3.15.6" unless const_defined?(:VERSION)
VERSION = "3.15.7" unless const_defined?(:VERSION)
end

0 comments on commit 016b52d

Please sign in to comment.