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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Small Admin UI tweaks
Damian Legawiecdd7ed5cbb763
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scssindex 87395a9101..ede7138394 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss@@ -3,7 +3,7 @@}#page-header {- height: 60px;+ height: 70px;display: flex;align-items: center;}@@ -140,7 +140,7 @@display: flex;flex-direction: column;list-style: none;- margin-top: 0.25rem;+ padding-top: 0.25rem;padding-left: 2rem;&:before {content: '';@@ -208,20 +208,14 @@}#enterprise-edition-notice {+ @extend .alert;@extend .alert-info;background-image: none;position: relative;- padding: 0.5rem 1rem;- padding-right: 2rem;- border-top: 1px solid $border-color;- border-left: 0;- border-right: 0;- border-bottom: 0;- border-radius: 0;font-size: $font-size-sm;- margin-bottom: 0;- margin-right: 1px;+ padding: 0.5rem 1rem;+ margin: 0.75rem;p {margin-bottom: 0.5rem;}diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex 335464a742..7f04d1dba9 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -11,7 +11,7 @@<h3 class="page-header-title mb-0 d-flex align-items-center gap-3"><%= yield :page_title %></h3>- <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-2">+ <div id="page_actions" class="ml-auto page-actions d-flex align-items-center gap-3"><% if action_name == 'index' && defined?(model_class) && model_class && Spree::Export.available_models.include?(model_class) && can?(:create, Spree::Export) %><span data-toggle="modal" data-target="#modal"><%= link_to spree.new_admin_export_path(export: { search_params: params[:q]&.to_json, type: Spree::Export.type_for_model(model_class) }), class: 'btn btn-light bg-transparent with-tip', title: 'Download records as CSV file', data: { turbo_frame: :dialog_modal } do %>diff --git a/admin/app/views/spree/admin/shared/_sidebar.html.erb b/admin/app/views/spree/admin/shared/_sidebar.html.erbindex 72db014d85..08452c27ce 100644--- a/admin/app/views/spree/admin/shared/_sidebar.html.erb+++ b/admin/app/views/spree/admin/shared/_sidebar.html.erb@@ -4,8 +4,4 @@<% else %><%= render 'spree/admin/shared/sidebar/store_nav' %><% end %>-- <% unless settings_active? %>- <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>- <% end %></aside>\ No newline at end of filediff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erbindex cd74415d87..bc22a8bc88 100644--- a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb+++ b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb@@ -119,10 +119,14 @@<%= render 'spree/admin/shared/sidebar/integrations_nav' %></ul>- <ul class="nav flex-column mt-auto mb-2">- <% if can?(:manage, current_store) %>- <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>- <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %>- <% end %>- </ul>+ <div class="mt-auto d-flex flex-column">+ <%= render 'spree/admin/shared/sidebar/enterprise_edition_notice' %>++ <ul class="nav flex-column mb-2">+ <% if can?(:manage, current_store) %>+ <%= nav_item(Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), icon: 'settings', active: params[:section] == 'general-settings') %>+ <%= nav_item(Spree.t(:users), spree.admin_admin_users_path, icon: 'users') %>+ <% end %>+ </ul>+ </div><% end %>