Skip to content
This repository has been archived by the owner on Aug 10, 2021. It is now read-only.

Update Bootstrap to version 4 #138

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion app/overrides/add_rich_editor_tab.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
virtual_path: 'spree/admin/shared/sub_menu/_configuration',
name: 'add_rich_editor_tab',
insert_bottom: '[data-hook="admin_configurations_sidebar_menu"]',
text: '<li<%== " class=\"active\"" if controller.controller_name == "editor_settings" %>><%= link_to Spree.t(:rich_editor), spree.edit_admin_editor_settings_path %></li>'
partial: 'spree/admin/editor_settings/rich_editor'
)
3 changes: 3 additions & 0 deletions app/views/spree/admin/editor_settings/_rich_editor.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<li class="sidebar-menu-item d-block w-100<%== " selected" if controller.controller_name == "editor_settings" %>">
<%= link_to Spree.t(:rich_editor), spree.edit_admin_editor_settings_path, { class: "py-1 px-3 d-block sidebar-submenu-item #{ 'text-success' if controller.controller_name == "editor_settings" }"} %>
</li>
2 changes: 1 addition & 1 deletion app/views/spree/admin/editor_settings/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<%= label_tag(:current_editor, Spree.t(:rich_editor_engine)) %>
<%= select_tag(:current_editor, options_for_select(Spree::EditorSetting.editors, SpreeEditor::Config[:current_editor]), class: 'select2') %>
</div>
<div class="checkbox">
<div class="checkbox form-group">
<%= label_tag(:enabled) do %>
<%= preference_field_tag(:enabled, SpreeEditor::Config[:enabled], type: :boolean) %>
<%= Spree.t(:enable_rich_editor) %>
Expand Down