From 65e5643b134b2d5911364d0c26d5460731ad855d Mon Sep 17 00:00:00 2001 From: cryptogopher Date: Sun, 5 Jul 2026 16:06:02 +0200 Subject: [PATCH] Remove pictograms directory --- .../{pictograms => }/account-multiple-outline.svg | 0 .../images/{pictograms => }/account-plus-outline.svg | 0 .../images/{pictograms => }/account-remove-outline.svg | 0 .../images/{pictograms => }/account-wrench-outline.svg | 0 app/assets/images/{pictograms => }/alert-outline.svg | 0 .../{pictograms => }/arrow-left-bold-outline.svg | 0 app/assets/images/{pictograms => }/axis-arrow.svg | 0 app/assets/images/{pictograms => }/bug-outline.svg | 0 .../images/{pictograms => }/check-circle-outline.svg | 0 .../{pictograms => }/checkbox-marked-outline.svg | 0 app/assets/images/{pictograms => }/chevron-down.svg | 0 .../images/{pictograms => }/close-circle-outline.svg | 0 app/assets/images/{pictograms => }/close-outline.svg | 0 app/assets/images/{pictograms => }/code-braces.svg | 0 app/assets/images/{pictograms => }/delete-outline.svg | 0 .../{pictograms => }/download-multiple-outline.svg | 0 .../images/{pictograms => }/download-outline.svg | 0 .../images/{pictograms => }/email-sync-outline.svg | 0 app/assets/images/{pictograms => }/import.svg | 0 app/assets/images/{pictograms => }/incognito-off.svg | 0 app/assets/images/{pictograms => }/incognito.svg | 0 app/assets/images/{pictograms => }/lock-reset.svg | 0 app/assets/images/{pictograms => }/login.svg | 0 app/assets/images/{pictograms => }/logout.svg | 0 app/assets/images/{pictograms => }/pencil-outline.svg | 0 .../images/{pictograms => }/plus-circle-outline.svg | 0 .../images/{pictograms => }/plus-multiple-outline.svg | 0 app/assets/images/{pictograms => }/plus-outline.svg | 0 app/assets/images/{pictograms => }/scale-bathroom.svg | 0 app/assets/images/{pictograms => }/update.svg | 0 app/assets/images/{pictograms => }/upload-outline.svg | 0 app/assets/images/{pictograms => }/weight-gram.svg | 0 app/assets/stylesheets/application.css | 6 +++--- app/helpers/application_helper.rb | 10 +++++----- app/views/users/index.html.erb | 4 +--- app/views/users/profiles/edit.html.erb | 2 +- app/views/users/show.html.erb | 3 +-- 37 files changed, 11 insertions(+), 14 deletions(-) rename app/assets/images/{pictograms => }/account-multiple-outline.svg (100%) rename app/assets/images/{pictograms => }/account-plus-outline.svg (100%) rename app/assets/images/{pictograms => }/account-remove-outline.svg (100%) rename app/assets/images/{pictograms => }/account-wrench-outline.svg (100%) rename app/assets/images/{pictograms => }/alert-outline.svg (100%) rename app/assets/images/{pictograms => }/arrow-left-bold-outline.svg (100%) rename app/assets/images/{pictograms => }/axis-arrow.svg (100%) rename app/assets/images/{pictograms => }/bug-outline.svg (100%) rename app/assets/images/{pictograms => }/check-circle-outline.svg (100%) rename app/assets/images/{pictograms => }/checkbox-marked-outline.svg (100%) rename app/assets/images/{pictograms => }/chevron-down.svg (100%) rename app/assets/images/{pictograms => }/close-circle-outline.svg (100%) rename app/assets/images/{pictograms => }/close-outline.svg (100%) rename app/assets/images/{pictograms => }/code-braces.svg (100%) rename app/assets/images/{pictograms => }/delete-outline.svg (100%) rename app/assets/images/{pictograms => }/download-multiple-outline.svg (100%) rename app/assets/images/{pictograms => }/download-outline.svg (100%) rename app/assets/images/{pictograms => }/email-sync-outline.svg (100%) rename app/assets/images/{pictograms => }/import.svg (100%) rename app/assets/images/{pictograms => }/incognito-off.svg (100%) rename app/assets/images/{pictograms => }/incognito.svg (100%) rename app/assets/images/{pictograms => }/lock-reset.svg (100%) rename app/assets/images/{pictograms => }/login.svg (100%) rename app/assets/images/{pictograms => }/logout.svg (100%) rename app/assets/images/{pictograms => }/pencil-outline.svg (100%) rename app/assets/images/{pictograms => }/plus-circle-outline.svg (100%) rename app/assets/images/{pictograms => }/plus-multiple-outline.svg (100%) rename app/assets/images/{pictograms => }/plus-outline.svg (100%) rename app/assets/images/{pictograms => }/scale-bathroom.svg (100%) rename app/assets/images/{pictograms => }/update.svg (100%) rename app/assets/images/{pictograms => }/upload-outline.svg (100%) rename app/assets/images/{pictograms => }/weight-gram.svg (100%) diff --git a/app/assets/images/pictograms/account-multiple-outline.svg b/app/assets/images/account-multiple-outline.svg similarity index 100% rename from app/assets/images/pictograms/account-multiple-outline.svg rename to app/assets/images/account-multiple-outline.svg diff --git a/app/assets/images/pictograms/account-plus-outline.svg b/app/assets/images/account-plus-outline.svg similarity index 100% rename from app/assets/images/pictograms/account-plus-outline.svg rename to app/assets/images/account-plus-outline.svg diff --git a/app/assets/images/pictograms/account-remove-outline.svg b/app/assets/images/account-remove-outline.svg similarity index 100% rename from app/assets/images/pictograms/account-remove-outline.svg rename to app/assets/images/account-remove-outline.svg diff --git a/app/assets/images/pictograms/account-wrench-outline.svg b/app/assets/images/account-wrench-outline.svg similarity index 100% rename from app/assets/images/pictograms/account-wrench-outline.svg rename to app/assets/images/account-wrench-outline.svg diff --git a/app/assets/images/pictograms/alert-outline.svg b/app/assets/images/alert-outline.svg similarity index 100% rename from app/assets/images/pictograms/alert-outline.svg rename to app/assets/images/alert-outline.svg diff --git a/app/assets/images/pictograms/arrow-left-bold-outline.svg b/app/assets/images/arrow-left-bold-outline.svg similarity index 100% rename from app/assets/images/pictograms/arrow-left-bold-outline.svg rename to app/assets/images/arrow-left-bold-outline.svg diff --git a/app/assets/images/pictograms/axis-arrow.svg b/app/assets/images/axis-arrow.svg similarity index 100% rename from app/assets/images/pictograms/axis-arrow.svg rename to app/assets/images/axis-arrow.svg diff --git a/app/assets/images/pictograms/bug-outline.svg b/app/assets/images/bug-outline.svg similarity index 100% rename from app/assets/images/pictograms/bug-outline.svg rename to app/assets/images/bug-outline.svg diff --git a/app/assets/images/pictograms/check-circle-outline.svg b/app/assets/images/check-circle-outline.svg similarity index 100% rename from app/assets/images/pictograms/check-circle-outline.svg rename to app/assets/images/check-circle-outline.svg diff --git a/app/assets/images/pictograms/checkbox-marked-outline.svg b/app/assets/images/checkbox-marked-outline.svg similarity index 100% rename from app/assets/images/pictograms/checkbox-marked-outline.svg rename to app/assets/images/checkbox-marked-outline.svg diff --git a/app/assets/images/pictograms/chevron-down.svg b/app/assets/images/chevron-down.svg similarity index 100% rename from app/assets/images/pictograms/chevron-down.svg rename to app/assets/images/chevron-down.svg diff --git a/app/assets/images/pictograms/close-circle-outline.svg b/app/assets/images/close-circle-outline.svg similarity index 100% rename from app/assets/images/pictograms/close-circle-outline.svg rename to app/assets/images/close-circle-outline.svg diff --git a/app/assets/images/pictograms/close-outline.svg b/app/assets/images/close-outline.svg similarity index 100% rename from app/assets/images/pictograms/close-outline.svg rename to app/assets/images/close-outline.svg diff --git a/app/assets/images/pictograms/code-braces.svg b/app/assets/images/code-braces.svg similarity index 100% rename from app/assets/images/pictograms/code-braces.svg rename to app/assets/images/code-braces.svg diff --git a/app/assets/images/pictograms/delete-outline.svg b/app/assets/images/delete-outline.svg similarity index 100% rename from app/assets/images/pictograms/delete-outline.svg rename to app/assets/images/delete-outline.svg diff --git a/app/assets/images/pictograms/download-multiple-outline.svg b/app/assets/images/download-multiple-outline.svg similarity index 100% rename from app/assets/images/pictograms/download-multiple-outline.svg rename to app/assets/images/download-multiple-outline.svg diff --git a/app/assets/images/pictograms/download-outline.svg b/app/assets/images/download-outline.svg similarity index 100% rename from app/assets/images/pictograms/download-outline.svg rename to app/assets/images/download-outline.svg diff --git a/app/assets/images/pictograms/email-sync-outline.svg b/app/assets/images/email-sync-outline.svg similarity index 100% rename from app/assets/images/pictograms/email-sync-outline.svg rename to app/assets/images/email-sync-outline.svg diff --git a/app/assets/images/pictograms/import.svg b/app/assets/images/import.svg similarity index 100% rename from app/assets/images/pictograms/import.svg rename to app/assets/images/import.svg diff --git a/app/assets/images/pictograms/incognito-off.svg b/app/assets/images/incognito-off.svg similarity index 100% rename from app/assets/images/pictograms/incognito-off.svg rename to app/assets/images/incognito-off.svg diff --git a/app/assets/images/pictograms/incognito.svg b/app/assets/images/incognito.svg similarity index 100% rename from app/assets/images/pictograms/incognito.svg rename to app/assets/images/incognito.svg diff --git a/app/assets/images/pictograms/lock-reset.svg b/app/assets/images/lock-reset.svg similarity index 100% rename from app/assets/images/pictograms/lock-reset.svg rename to app/assets/images/lock-reset.svg diff --git a/app/assets/images/pictograms/login.svg b/app/assets/images/login.svg similarity index 100% rename from app/assets/images/pictograms/login.svg rename to app/assets/images/login.svg diff --git a/app/assets/images/pictograms/logout.svg b/app/assets/images/logout.svg similarity index 100% rename from app/assets/images/pictograms/logout.svg rename to app/assets/images/logout.svg diff --git a/app/assets/images/pictograms/pencil-outline.svg b/app/assets/images/pencil-outline.svg similarity index 100% rename from app/assets/images/pictograms/pencil-outline.svg rename to app/assets/images/pencil-outline.svg diff --git a/app/assets/images/pictograms/plus-circle-outline.svg b/app/assets/images/plus-circle-outline.svg similarity index 100% rename from app/assets/images/pictograms/plus-circle-outline.svg rename to app/assets/images/plus-circle-outline.svg diff --git a/app/assets/images/pictograms/plus-multiple-outline.svg b/app/assets/images/plus-multiple-outline.svg similarity index 100% rename from app/assets/images/pictograms/plus-multiple-outline.svg rename to app/assets/images/plus-multiple-outline.svg diff --git a/app/assets/images/pictograms/plus-outline.svg b/app/assets/images/plus-outline.svg similarity index 100% rename from app/assets/images/pictograms/plus-outline.svg rename to app/assets/images/plus-outline.svg diff --git a/app/assets/images/pictograms/scale-bathroom.svg b/app/assets/images/scale-bathroom.svg similarity index 100% rename from app/assets/images/pictograms/scale-bathroom.svg rename to app/assets/images/scale-bathroom.svg diff --git a/app/assets/images/pictograms/update.svg b/app/assets/images/update.svg similarity index 100% rename from app/assets/images/pictograms/update.svg rename to app/assets/images/update.svg diff --git a/app/assets/images/pictograms/upload-outline.svg b/app/assets/images/upload-outline.svg similarity index 100% rename from app/assets/images/pictograms/upload-outline.svg rename to app/assets/images/upload-outline.svg diff --git a/app/assets/images/pictograms/weight-gram.svg b/app/assets/images/weight-gram.svg similarity index 100% rename from app/assets/images/pictograms/weight-gram.svg rename to app/assets/images/weight-gram.svg diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index db5f3eb..3b42b2f 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -365,14 +365,14 @@ header { width: 1.4em; } .flash.alert::before { - content: url('pictograms/alert-outline.svg'); + content: url('alert-outline.svg'); } .flash.alert { border-color: var(--color-red); background-color: var(--color-red); } .flash.notice::before { - content: url('pictograms/check-circle-outline.svg'); + content: url('check-circle-outline.svg'); } .flash.notice { border-color: var(--color-blue); @@ -579,7 +579,7 @@ summary::before { background-color: currentColor; content: ""; height: 1em; - mask-image: url('pictograms/chevron-down.svg'); + mask-image: url('chevron-down.svg'); mask-size: cover; width: 1em; } diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index ea3c348..64f28a0 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -135,7 +135,7 @@ module ApplicationHelper def submit_default_value svg_name = object ? (object.persisted? ? 'update' : 'plus-circle-outline') : '' - @template.svg_tag("pictograms/#{svg_name}", super) + @template.svg_tag(svg_name, super) end def except_pattern(value, pattern = nil) @@ -164,7 +164,7 @@ module ApplicationHelper def svg_tag(source, label = nil, options = {}) label, options = nil, label if label.is_a? Hash svg_tag = tag.svg(**options) do - tag.use(href: "#{image_path(source + ".svg")}#icon") + tag.use(href: image_path("#{source}.svg") + '#icon') end label.blank? ? svg_tag : svg_tag + tag.span(label) end @@ -180,7 +180,7 @@ module ApplicationHelper menu_tabs.map do |name, image, status, css_class| if current_user.at_least(status) - link_to svg_tag("pictograms/#{image}", t("#{name}.navigation")), + link_to svg_tag(image, t("#{name}.navigation")), {controller: "/#{name}", action: "index"}, class: class_names('tab', css_class, active: name == current_tab) end @@ -231,7 +231,7 @@ module ApplicationHelper Array(messages).map do |message| tag.div class: "flash #{entry}" do tag.span(sanitize(message)) + - svg_tag('pictograms/close-outline', {onclick: "this.parentElement.remove()"}) + svg_tag('close-outline', {onclick: "this.parentElement.remove()"}) end end end.join.html_safe @@ -263,7 +263,7 @@ module ApplicationHelper link_is_local = html_options[:onclick] || html_options.dig(:data, :turbo_stream) name = name.to_s name += '...' if type == :link && !link_is_local - name = svg_tag("pictograms/#{image}", name) if image + name = svg_tag(image, name) if image [name, html_options] end diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb index ac351b1..ee4f542 100644 --- a/app/views/users/index.html.erb +++ b/app/views/users/index.html.erb @@ -22,9 +22,7 @@ <% end %> <% end %> - - <%= svg_tag 'pictograms/checkbox-marked-outline' if user.confirmed_at.present? %> - + <%= svg_tag 'checkbox-marked-outline' if user.confirmed_at.present? %> <%= l user.created_at, format: :without_tz %> <% if allow_disguise?(user) %> diff --git a/app/views/users/profiles/edit.html.erb b/app/views/users/profiles/edit.html.erb index 9e1907a..bf12685 100644 --- a/app/views/users/profiles/edit.html.erb +++ b/app/views/users/profiles/edit.html.erb @@ -1,5 +1,5 @@ <% content_for :navigation, flush: true do %> - <%= link_to svg_tag('pictograms/arrow-left-bold-outline', t(:back)), + <%= link_to svg_tag('arrow-left-bold-outline', t(:back)), request.referer.present? ? :back : root_path, class: 'tab' %> <% end %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 320834e..6fbe919 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,6 +1,5 @@ <% content_for :navigation, flush: true do %> - <%= link_to svg_tag('pictograms/arrow-left-bold-outline', t(:back)), users_path, - class: 'tab' %> + <%= link_to svg_tag('arrow-left-bold-outline', t(:back)), users_path, class: 'tab' %> <% end %> <%= labeled_form_for @user, html: {class: 'main-area'} do |f| %>