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
Admin UI: improve nav pills and filters
Damian Legawiec839866a32845
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scssindex 965dcb3308..f26f901f87 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss@@ -33,7 +33,6 @@.nav-link {font-weight: 500;- border: 1px solid transparent;&:hover {color: theme-color('primary') !important;@@ -42,24 +41,6 @@&.active, &:focus, &:active {background-color: $gray-50;color: theme-color('primary') !important;- border: 1px solid $gray-100;- }- }- }-}--.nav-bare {- .nav-item {- @extend .mr-4;-- .nav-link {- @extend .px-0;- color: $gray-600;-- &.active {- background-color: transparent;- color: theme-color('primary') !important;- font-weight: 600;}}}diff --git a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss b/admin/app/assets/stylesheets/spree/admin/components/_tables.scssindex 4dce2a1681..1a85dfd62c 100644--- a/admin/app/assets/stylesheets/spree/admin/components/_tables.scss+++ b/admin/app/assets/stylesheets/spree/admin/components/_tables.scss@@ -3,10 +3,18 @@}.filter-wrap {- padding: 0.75rem;+ padding: 0.5rem;border-bottom: 1px solid $gray-50;}+#table-filter {+ padding: 0.75rem;+ border-radius: $border-radius;+ border: 1px solid $gray-50;+ background-color: $gray-25;+ margin-top: 0.5rem;+}+table.table {margin-bottom: 0;diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scssindex 1aa2d9fcc2..0e8557c145 100644--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss@@ -98,7 +98,8 @@ $btn-active-box-shadow: inset 0 3px 5px rgba($black, .025) !default;$btn-font-weight: 500 !default;$btn-disabled-opacity: 0.3 !default;-$navbar-brand-height: 3.625rem;+$nav-link-padding-y: .5rem !default;+$nav-link-padding-x: .6rem !default;$box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1),0 2px 4px -1px rgba(0, 0, 0, 0.06) !default;$box-shadow-xs: rgba(43, 34, 51, 0.04) 0px 1px 2px !default;diff --git a/admin/app/views/spree/admin/orders/_filters.html.erb b/admin/app/views/spree/admin/orders/_filters.html.erbindex 2903832324..3e9db98077 100644--- a/admin/app/views/spree/admin/orders/_filters.html.erb+++ b/admin/app/views/spree/admin/orders/_filters.html.erb@@ -36,7 +36,7 @@<%= render 'spree/admin/shared/filters_button' %></div></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><%= f.hidden_field :payment_state_eq, value: params.dig(:q, :payment_state_eq) %><%= f.hidden_field :payment_state_not_eq, value: params.dig(:q, :payment_state_not_eq) %><%= f.hidden_field :refunded, value: params.dig(:q, :refunded) %>diff --git a/admin/app/views/spree/admin/posts/_filters.html.erb b/admin/app/views/spree/admin/posts/_filters.html.erbindex 65359a1dae..483c0ed66a 100644--- a/admin/app/views/spree/admin/posts/_filters.html.erb+++ b/admin/app/views/spree/admin/posts/_filters.html.erb@@ -4,7 +4,7 @@<%= render 'spree/admin/shared/filters_button' %></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><div class="row"><div class="col-lg-6"><div class="form-group">diff --git a/admin/app/views/spree/admin/products/_filters.html.erb b/admin/app/views/spree/admin/products/_filters.html.erbindex 1b8173449f..664dc7fd5c 100644--- a/admin/app/views/spree/admin/products/_filters.html.erb+++ b/admin/app/views/spree/admin/products/_filters.html.erb@@ -7,7 +7,7 @@<%= render 'spree/admin/shared/filters_button' %></div></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><%= f.hidden_field :status_eq, value: params.dig(:q, :status_eq) %><div class="row"><div class="col-12 col-lg-6">diff --git a/admin/app/views/spree/admin/promotions/index.html.erb b/admin/app/views/spree/admin/promotions/index.html.erbindex 82e36e62b5..56a63b4327 100644--- a/admin/app/views/spree/admin/promotions/index.html.erb+++ b/admin/app/views/spree/admin/promotions/index.html.erb@@ -17,7 +17,7 @@<%= render 'spree/admin/shared/filters_button' %></div></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><div class="row"><div class="col-12 col-lg-6"><div class="form-group">diff --git a/admin/app/views/spree/admin/reports/new.html.erb b/admin/app/views/spree/admin/reports/new.html.erbindex 12cee70bf1..c63640c9ad 100644--- a/admin/app/views/spree/admin/reports/new.html.erb+++ b/admin/app/views/spree/admin/reports/new.html.erb@@ -9,12 +9,12 @@<%= f.hidden_field :date_from %><%= f.hidden_field :date_to %><%= f.hidden_field :currency %>- <button class="btn btn-primary with-tip" title="Download report as CSV file">- <%= icon('download') %>- <%= Spree.t(:download) %>+ <button class="btn btn-primary with-tip" title="Export report as CSV file">+ <%= icon('table-export') %>+ <%= Spree.t(:export) %></button><% end %>-<% end %>+<% end if can?(:create, Spree::Export) %><div class="mb-2"><%= form_tag spree.new_admin_report_path, method: :get, data: { controller: 'auto-submit' } do %>diff --git a/admin/app/views/spree/admin/shared/_content_header.html.erb b/admin/app/views/spree/admin/shared/_content_header.html.erbindex b573b54511..5288071897 100644--- a/admin/app/views/spree/admin/shared/_content_header.html.erb+++ b/admin/app/views/spree/admin/shared/_content_header.html.erb@@ -63,7 +63,7 @@<% end %><% if content_for?(:page_tabs) %>- <ul class="nav nav-bare flex-nowrap overflow-auto w-100 mb-3">+ <ul class="nav nav-pills flex-nowrap overflow-auto w-100 mb-3"><%= yield :page_tabs %></ul><% end %>diff --git a/admin/app/views/spree/admin/stock_items/_filters.html.erb b/admin/app/views/spree/admin/stock_items/_filters.html.erbindex ac73396dd4..2805d67b51 100644--- a/admin/app/views/spree/admin/stock_items/_filters.html.erb+++ b/admin/app/views/spree/admin/stock_items/_filters.html.erb@@ -4,7 +4,7 @@<%= render 'spree/admin/shared/filters_button' %></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><div class="row"><div class="col-12 col-lg-6"><div class="form-group">diff --git a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb b/admin/app/views/spree/admin/stock_transfers/_filters.html.erbindex b22c870b24..eb572a6e36 100644--- a/admin/app/views/spree/admin/stock_transfers/_filters.html.erb+++ b/admin/app/views/spree/admin/stock_transfers/_filters.html.erb@@ -3,7 +3,7 @@<%= render 'spree/admin/shared/filters_search_bar', param: :number_cont, label: Spree.t(:number) %><%= render 'spree/admin/shared/filters_button' %></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><div class="row"><div class="col-12 col-lg-6"><div class="form-group">diff --git a/admin/app/views/spree/admin/users/_filters.html.erb b/admin/app/views/spree/admin/users/_filters.html.erbindex ed23641131..4f8bdf14b6 100644--- a/admin/app/views/spree/admin/users/_filters.html.erb+++ b/admin/app/views/spree/admin/users/_filters.html.erb@@ -4,7 +4,7 @@<%= render 'spree/admin/shared/filters_button' %></div>- <div data-reveal-target="item" class="d-none mt-4" id="table-filter">+ <div data-reveal-target="item" class="d-none" id="table-filter"><div class="row"><div class="col-12 col-lg-6"><div class="form-group">