diff --git a/app/helpers/spree/admin/base_helper.rb b/app/helpers/spree/admin/base_helper.rb index 5a7ac10bfb..1c5b86f2b2 100644 --- a/app/helpers/spree/admin/base_helper.rb +++ b/app/helpers/spree/admin/base_helper.rb @@ -232,7 +232,7 @@ def order_time(time) end def required_span_tag - content_tag(:span, ' *', class: 'required font-weight-bold text-danger') + content_tag(:span, ' *', class: 'required fw-bold text-danger') end def external_page_preview_link(resource, options = {}) diff --git a/app/helpers/spree/admin/navigation_helper.rb b/app/helpers/spree/admin/navigation_helper.rb index 5bdea1bb80..9c00c3de27 100644 --- a/app/helpers/spree/admin/navigation_helper.rb +++ b/app/helpers/spree/admin/navigation_helper.rb @@ -62,7 +62,7 @@ def tab(*args) link_to( titleized_label, destination_url, - class: "sidebar-submenu-item w-100 py-2 py-md-1 ps-5 d-block #{selected ? 'font-weight-bold' : 'text-muted'}" + class: "sidebar-submenu-item w-100 py-2 py-md-1 ps-5 d-block #{selected ? 'fw-bold' : 'text-muted'}" ) end @@ -255,7 +255,7 @@ def configurations_sidebar_menu_item(link_text, url, options = {}) url.ends_with?("#{controller.controller_name.singularize}/edit") options[:class] = 'sidebar-menu-item d-block w-100' - options[:class] << ' selected font-weight-bold' if options[:is_selected] + options[:class] << ' selected fw-bold' if options[:is_selected] content_tag(:li, options) do link_to(link_text, url, class: "#{'text-muted' unless options[:is_selected]} sidebar-submenu-item w-100 py-2 py-md-1 ps-5 d-block") end diff --git a/app/views/spree/admin/digitals/_form.html.erb b/app/views/spree/admin/digitals/_form.html.erb index 090da9462f..7763cbe38b 100644 --- a/app/views/spree/admin/digitals/_form.html.erb +++ b/app/views/spree/admin/digitals/_form.html.erb @@ -25,7 +25,7 @@ <% end %> <%= f.field_container :attachment, data: {controller: "upload-button"} do %> - <%= f.label :file, Spree.t('admin.digitals.add_new_file'), id: "digital_attachment_#{variant.id}" %> *
+ <%= f.label :file, Spree.t('admin.digitals.add_new_file'), id: "digital_attachment_#{variant.id}" %> *
<%= f.file_field :attachment, id: "digital_attachment_#{variant.id}", required: true, data: { action: "input->upload-button#buttonState" } %> <%= hidden_field_tag 'digital[variant_id]', variant.id %> <%= button Spree.t('admin.digitals.upload'), 'add.svg', 'submit', { data: { upload_button_target: "uploadButton" } } %> diff --git a/app/views/spree/admin/shared/_order_summary.html.erb b/app/views/spree/admin/shared/_order_summary.html.erb index 706af11aa4..8a023df9ec 100644 --- a/app/views/spree/admin/shared/_order_summary.html.erb +++ b/app/views/spree/admin/shared/_order_summary.html.erb @@ -39,7 +39,7 @@ <% if @order.completed? %>
  • <%= Spree.t(:date_completed) %> - + <%= pretty_time(@order.completed_at) %>
  • @@ -48,14 +48,14 @@ <% if @order.approved? %>
  • <%= Spree.t(:approved_at) %> - + <%= pretty_time(@order.approved_at) %>
  • <% if @order.approver.present? %>
  • <%= Spree.t(:approver) %> - + <%= link_to @order.approver.email, spree.admin_users_path(@order.approver) %>
  • @@ -65,14 +65,14 @@ <% if @order.canceled? && @order.canceled_at %>
  • <%= Spree.t(:canceled_at) %> - + <%= pretty_time(@order.canceled_at) %>
  • <% if @order.canceler.present? %>
  • <%= Spree.t(:canceler) %> - + <%= link_to @order.canceler.email, spree.admin_users_path(@order.canceler) %>