Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Update UI

Matthew Kennedy78dc0fd2b1e8
diff --git a/backend/app/assets/images/backend-file-richtext.svg b/backend/app/assets/images/backend-file-richtext.svg
new file mode 100644
index 0000000000..22edf68c14
--- /dev/null
+++ b/backend/app/assets/images/backend-file-richtext.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-file-richtext" viewBox="0 0 16 16">
+ <path d="M7 4.25a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0zm-.861 1.542 1.33.886 1.854-1.855a.25.25 0 0 1 .289-.047l1.888.974V7.5a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V7s1.54-1.274 1.639-1.208zM5 9a.5.5 0 0 0 0 1h6a.5.5 0 0 0 0-1H5zm0 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1H5z"/>
+ <path d="M2 2a2 2 0 0 1 2-2h8a2 2 0 0 1 2 2v12a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V2zm10-1H4a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1z"/>
+</svg>
\ No newline at end of file
diff --git a/backend/app/assets/images/backend-phone.svg b/backend/app/assets/images/backend-phone.svg
new file mode 100644
index 0000000000..3f3fd74c11
--- /dev/null
+++ b/backend/app/assets/images/backend-phone.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-phone" viewBox="0 0 16 16">
+ <path d="M11 1a1 1 0 0 1 1 1v12a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V2a1 1 0 0 1 1-1h6zM5 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5z"/>
+ <path d="M8 14a1 1 0 1 0 0-2 1 1 0 0 0 0 2z"/>
+</svg>
\ No newline at end of file
diff --git a/backend/app/assets/images/backend-translate.svg b/backend/app/assets/images/backend-translate.svg
new file mode 100644
index 0000000000..39a17d228d
--- /dev/null
+++ b/backend/app/assets/images/backend-translate.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-translate" viewBox="0 0 16 16">
+ <path d="M4.545 6.714 4.11 8H3l1.862-5h1.284L8 8H6.833l-.435-1.286H4.545zm1.634-.736L5.5 3.956h-.049l-.679 2.022H6.18z"/>
+ <path d="M0 2a2 2 0 0 1 2-2h7a2 2 0 0 1 2 2v3h3a2 2 0 0 1 2 2v7a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2v-3H2a2 2 0 0 1-2-2V2zm2-1a1 1 0 0 0-1 1v7a1 1 0 0 0 1 1h7a1 1 0 0 0 1-1V2a1 1 0 0 0-1-1H2zm7.138 9.995c.193.301.402.583.63.846-.748.575-1.673 1.001-2.768 1.292.178.217.451.635.555.867 1.125-.359 2.08-.844 2.886-1.494.777.665 1.739 1.165 2.93 1.472.133-.254.414-.673.629-.89-1.125-.253-2.057-.694-2.82-1.284.681-.747 1.222-1.651 1.621-2.757H14V8h-3v1.047h.765c-.318.844-.74 1.546-1.272 2.13a6.066 6.066 0 0 1-.415-.492 1.988 1.988 0 0 1-.94.31z"/>
+</svg>
\ No newline at end of file
diff --git a/backend/app/assets/images/backend-window-sidebar.svg b/backend/app/assets/images/backend-window-sidebar.svg
new file mode 100644
index 0000000000..98476ce873
--- /dev/null
+++ b/backend/app/assets/images/backend-window-sidebar.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-window-sidebar" viewBox="0 0 16 16">
+ <path d="M2.5 4a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1zm2-.5a.5.5 0 1 1-1 0 .5.5 0 0 1 1 0zm1 .5a.5.5 0 1 0 0-1 .5.5 0 0 0 0 1z"/>
+ <path d="M2 1a2 2 0 0 0-2 2v10a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V3a2 2 0 0 0-2-2H2zm12 1a1 1 0 0 1 1 1v2H1V3a1 1 0 0 1 1-1h12zM1 13V6h4v8H2a1 1 0 0 1-1-1zm5 1V6h9v7a1 1 0 0 1-1 1H6z"/>
+</svg>
\ No newline at end of file
diff --git a/backend/app/assets/stylesheets/spree/backend/global/_mixins.scss b/backend/app/assets/stylesheets/spree/backend/global/_mixins.scss
index 918260e952..d6b082a5a1 100644
--- a/backend/app/assets/stylesheets/spree/backend/global/_mixins.scss
+++ b/backend/app/assets/stylesheets/spree/backend/global/_mixins.scss
@@ -22,21 +22,25 @@
@mixin switch($res: 'sm') {
$index: 1rem;
$mainVal: 1rem;
+ $baseVal: 1rem;
@if $res == 'md' {
$index: 2rem;
$mainVal: 1.5rem;
+ $baseVal: 1rem;
min-height: $index;
} @else if $res == 'lg' {
$index: 3rem;
$mainVal: 2rem;
+ $baseVal: 1rem;
} @else if $res == 'xl' {
$index: 4rem;
$mainVal: 2.5rem;
+ $baseVal: 1rem;
}
.custom-control-label {
- padding-left: #{$index};
+ padding-left: #{$baseVal};
padding-bottom: #{$mainVal};
}
diff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erb
index fac22cf208..93c0c49d65 100644
--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb
@@ -4,7 +4,7 @@
<div class="card sp-card">
<% unless %w[new create].include? controller.action_name %>
<div class="card-header col-12">
- <div class="row pb-0">
+ <div class="row no-gutters pb-0">
<div class="col d-flex justify-content-start align-items-center">
<%= f.field_container :visible, class: ['form-group pb-0 mb-0'] do %>
<div class="custom-control custom-switch custom-switch-md">
@@ -20,10 +20,18 @@
</span>
<span class="page_visible badge badge-primary <% if @cms_page.draft_mode? %>d-none<% end %>">
- <%= svg_icon name: "view.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.visable') %>
+ <%= svg_icon name: "view.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.visible') %>
</span>
</span>
</div>
+ <div class="col-auto d-flex align-items-center">
+ <span class="badge badge-secondary mx-2">
+ <%= svg_icon name: "store.svg", width: '18', height: '18' %> <%= @cms_page.store.unique_name %>
+ </span>
+ <span class="badge badge-secondary">
+ <%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_page.locale) %>
+ </span>
+ </div>
</div>
</div>
<% end %>
@@ -125,7 +133,7 @@
<div class="row">
<div class="col-12">
<%= f.field_container :content, class: ['form-group'] do %>
- <%= f.text_area :content, { rows: 26, class: 'spree-rte'} %>
+ <%= f.text_area :content, { rows: 22, class: 'spree-rte'} %>
<%= f.error_message_on :content %>
<% end %>
</div>
diff --git a/backend/app/views/spree/admin/cms_pages/_section_template.html.erb b/backend/app/views/spree/admin/cms_pages/_section_template.html.erb
index 1f4235f7e7..c9194fda67 100644
--- a/backend/app/views/spree/admin/cms_pages/_section_template.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/_section_template.html.erb
@@ -6,7 +6,7 @@
<small class="form-text mt-0 text-muted"><%= spree_humanize_type(section.type) %></small>
<% if section.full_width_on_small %>
<small class="form-text mt-1">
- <%= svg_icon name: "mobile.svg", width: '23', height: '23' %>
+ <%= svg_icon name: "phone.svg", width: '23', height: '23' %>
<%= Spree.t('admin.cms.full_width') %>
</small>
<% end %>
diff --git a/backend/app/views/spree/admin/shared/_main_menu.html.erb b/backend/app/views/spree/admin/shared/_main_menu.html.erb
index b8ce902d1f..153163b615 100644
--- a/backend/app/views/spree/admin/shared/_main_menu.html.erb
+++ b/backend/app/views/spree/admin/shared/_main_menu.html.erb
@@ -48,7 +48,7 @@
<% if can? :admin, Spree::Menu %>
<ul class="nav nav-sidebar border-bottom" id="sidebarMenu">
- <%= main_menu_tree Spree.t('admin.tab.content'), icon: "pages.svg", sub_menu: "content", url: "#sidebar-content" %>
+ <%= main_menu_tree Spree.t('admin.tab.content'), icon: "window-sidebar.svg", sub_menu: "content", url: "#sidebar-content" %>
</ul>
<% end %>