Skip to content

Commit

Permalink
Merge pull request #2640 from tvdeyen/fix-image-usage-panel-icons
Browse files Browse the repository at this point in the history
Fix image usage info panel icons
  • Loading branch information
tvdeyen authored Dec 14, 2023
2 parents d5bacc5 + c9a9efa commit 757a0e7
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
11 changes: 4 additions & 7 deletions app/assets/stylesheets/alchemy/image_library.scss
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ $image-overlay-transition-easing: ease-in;
#pictures_page_list {
h3 {
display: flex;
align-items: center;
gap: $default-padding;
padding: 4px 8px 0;
margin: 0;
}
Expand All @@ -194,21 +196,16 @@ $image-overlay-transition-easing: ease-in;

li {
display: flex;
align-items: center;
gap: $default-padding;
padding: 2 * $default-padding;
border-radius: $default-border-radius;
white-space: normal;
margin-bottom: 1em;
}
}

.icon {
padding-top: 3px;
text-align: left;
width: 7%;
}

p {
width: 93%;
margin: 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion app/views/alchemy/admin/pages/unlock.js.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
locked_page_tab.remove()
}
if (locked_page_icon) {
locked_page_icon.innerHTML = '<i class="icon ri-file-line ri-fw"></i>'
locked_page_icon.outerHTML = '<span class="handle"><i class="icon ri-file-line ri-fw ri-xl"></i></span>'
}
Alchemy.growl('<%= flash[:notice] -%>')
})()
8 changes: 2 additions & 6 deletions app/views/alchemy/admin/pictures/_infos.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<% if page %>
<li>
<h3>
<%= render_icon 'file-alt' %>
<%= render_icon 'file' %>
<p><%= link_to page.name, edit_admin_page_path(page) %></p>
</h3>
<ul class="list">
Expand All @@ -35,11 +35,7 @@
<% page_link = link_to element.display_name_with_preview_text,
edit_admin_page_path(page, anchor: "element_#{element.id}") %>
<% ingredients = picture_ingredients.map { |p| Alchemy::IngredientEditor.new(p).translated_role }.to_sentence %>
<% if element.public? %>
<%= render_icon('window-maximize', style: 'regular') %>
<% else %>
<%= render_icon('window-close') %>
<% end %>
<%= render_icon('draggable', style: nil) %>
<p>
<%== Alchemy.t(:pictures_in_page, page: page_link, pictures: ingredients) %>
</p>
Expand Down

0 comments on commit 757a0e7

Please sign in to comment.