Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace picture css class after update #2917

Merged
merged 3 commits into from
Jun 5, 2024
Merged

Replace picture css class after update #2917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9b7f68e
Replace picture css class after update
tvdeyen Jun 4, 2024
5d72bed
Use translated css class unless passed as array
tvdeyen Jun 4, 2024
81d02df
Update picture css class label style.
tvdeyen Jun 4, 2024
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
17 changes: 14 additions & 3 deletions app/assets/stylesheets/alchemy/elements.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,14 +636,25 @@ alchemy-publish-element-button {

.picture_ingredient_css_class {
position: absolute;
z-index: 1;
bottom: 34px;
background-color: rgba(255, 254, 255, 0.7);
width: 100%;
display: flex;
align-items: center;
gap: 4px;
z-index: 0;
bottom: 35px;
background-color: rgba(0, 0, 0, 0.15);
text-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
color: var(--color-white);
padding: 4px 8px;
font-size: $small-font-size;
overflow: hidden;
max-width: 100%;
text-overflow: ellipsis;

.icon {
fill: currentColor;
filter: drop-shadow(0 0 2px rgba(0, 0, 0, 0.25));
}
}
}

Expand Down
13 changes: 10 additions & 3 deletions app/views/alchemy/admin/ingredients/_picture_fields.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,16 @@
include_blank: false %>
<%- end -%>
<%- if ingredient.settings[:css_classes].present? -%>
<%= f.input :css_class,
collection: ingredient.settings[:css_classes],
include_blank: Alchemy.t('None') %>
<% css_classes = ingredient.settings[:css_classes] %>
<% css_classes_collection = case css_classes.first
when Array
then css_classes
else
css_classes.map do |klass|
[Alchemy.t(klass, scope: "picture_ingredients.css_classes", default: picture_editor.css_class.camelcase), klass]
end
end %>
<%= f.input :css_class, collection: css_classes_collection, include_blank: false %>
<%- else -%>
<% Alchemy::Deprecation.warn %(Float positioning in Picture ingredients is deprecated. If you rely on them, please use `css_classes` in your "#{ingredient.role}" settings instead.) %>
<%= f.input :css_class,
Expand Down
7 changes: 7 additions & 0 deletions app/views/alchemy/admin/ingredients/update.turbo_stream.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,10 @@
<% if @ingredient.settings[:anchor] %>
<alchemy-action name="updateAnchorIcon" params="<%= [@ingredient.id, @ingredient.dom_id.present?].to_json %>"></alchemy-action>
<% end %>
<% if @ingredient.type == "Alchemy::Ingredients::Picture" %>
<%= turbo_stream.replace_all "[data-ingredient-id='#{@ingredient.id}'] .picture_ingredient_css_class",
partial: "alchemy/ingredients/shared/picture_css_class",
locals: {
css_class: Alchemy::IngredientEditor.new(@ingredient).css_class
} %>
<% end %>
7 changes: 3 additions & 4 deletions app/views/alchemy/ingredients/_picture_editor.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@
</div>
</div>
<%- if picture_editor.css_class.present? -%>
<div class="picture_ingredient_css_class">
<%= Alchemy.t("alchemy.picture_ingredients.css_classes.#{picture_editor.css_class}",
default: picture_editor.css_class.camelcase) %>
</div>
<%= render "alchemy/ingredients/shared/picture_css_class", {
css_class: picture_editor.css_class
} %>
<%- end -%>
<div class="edit_images_bottom">
<%= render "alchemy/ingredients/shared/picture_tools", {
Expand Down
6 changes: 6 additions & 0 deletions app/views/alchemy/ingredients/shared/_picture_css_class.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div class="picture_ingredient_css_class">
<%= render_icon "pencil-ruler-2", style: "line", size: "1x" %>
<%= Alchemy.t(css_class,
scope: "picture_ingredients.css_classes",
default: css_class.camelcase) %>
</div>