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.

Admin: improve modals, dropdowns, navigation, alerts

Damian Legawiec7b1987f29265
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
index 44c414af51..0716897534 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_dropdowns.scss
@@ -21,12 +21,10 @@
}
.dropdown-menu {
+ margin-top: 0.25rem !important;
overflow: hidden !important;
-
box-shadow: $dropdown-box-shadow;
- font-weight: 500;
-
.dropdown-item, .dropdown-header {
margin-bottom: 0.25rem;
padding-left: $input-btn-padding-x;
@@ -41,6 +39,8 @@
align-items: center;
justify-content: flex-start;
background: transparent;
+ transition: background 0.15s, color 0.1s;
+ will-change: background, color;
color: $gray-700;
@@ -74,15 +74,8 @@
.button_to {
width: 100%;
}
- .dropdown-divider {
- margin-top: 0.5rem;
- margin-bottom: 0.5rem;
- border-top: 1px solid $gray-50;
- }
.dropdown-header {
- @extend .font-weight-normal;
- @extend .text-uppercase;
- @extend .text-muted;
+ font-weight: $font-weight-base;
}
.dropdown-item:last-child {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
index 6bce31fe56..8fc8a48c25 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
@@ -25,7 +25,7 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {
display: flex;
flex-direction: column;
gap: 0.5rem;
- width: 250px;
+ width: 220px;
background-color: $gray-25;
border-right: 1px solid $gray-100;
height: 100vh;
@@ -44,7 +44,7 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {
padding-right: 0.75rem;
}
.nav {
- gap: 0.25rem;
+ gap: 0.125rem;
display: flex;
flex-direction: column;
}
@@ -57,23 +57,21 @@ turbo-frame[loading] .spinner-border, turbo-frame[busy] .spinner-border {
padding-right: 0.5rem;
padding-top: 0.35rem;
padding-bottom: 0.35rem;
- font-weight: 500;
- transition: background 0.35s, color 0.1s;
- will-change: background, color;
- color: $body-color;
+ font-weight: 400;
+ color: $gray-700;
.ti {
- font-size: 1.125rem;
+ font-size: 1rem;
margin-right: 0.5rem;
}
&:hover {
background-color: $gray-75;
- transition-duration: 75ms;
- animation-duration: 75ms;
}
&.active {
+ color: theme-color('primary');
background-color: $gray-100;
+ font-weight: 500;
}
.badge {
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
index 370666d241..a60ba6c245 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_modals.scss
@@ -8,15 +8,15 @@ body.modal-open {
overflow-x: clip;
}
+.modal-content {
+ box-shadow: $modal-content-box-shadow-xs;
+}
+
.modal-header {
@extend .align-items-center;
- border-bottom: 0;
.modal-title {
margin-bottom: 0;
- font-size: $font-size-plus;
- font-weight: $font-weight-bold;
- font-family: $font-family-sans-serif;
}
.btn-close {
@@ -27,19 +27,15 @@ body.modal-open {
display: flex;
justify-content: flex-end;
padding: $modal-inner-padding;
- border-top: 0;
+ background-color: #FAFAFA;
+ border-top: 1px solid $gray-50;
.btn {
- display: inline-flex !important;
+ display: inline-flex ;
width: auto !important;
}
}
-#multi-backdrop {
- z-index: 0;
- height: 0;
- width: 0;
-}
.modal-dialog turbo-frame {
display: block;
width: 100%;
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss
index f26f901f87..591df5d811 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_navigation.scss
@@ -9,7 +9,9 @@
.nav-link {
cursor: pointer;
- @extend .position-relative;
+ position: relative;
+ transition: background 0.15s, color 0.1s;
+ will-change: background, color;
}
#header {
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index 0e8557c145..b3d1d97c57 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -57,7 +57,7 @@ $font-size-sm: 0.75rem !default;
$font-size-lg: 1rem !default;
$font-weight-normal: 400 !default;
$font-weight-bold: 600 !default;
-$headings-font-family: Inter, sans-serif !default;
+$headings-font-family: $font-family-sans-serif;
$line-height-base: 1.5 !default;
$border-radius: 0.5rem !default;
$border-radius-sm: 0.4rem !default;
@@ -148,10 +148,24 @@ $dropdown-link-hover-bg: $gray-50 !default;
$dropdown-box-shadow: rgba(209, 217, 224, 0.8) 0px 0px 0px 1px, rgba(37, 41, 46, 0.04) 0px 6px 12px -3px, rgba(37, 41, 46, 0.12) 0px 6px 18px 0px !default;
$dropdown-padding-x: 0.25rem !default;
$dropdown-padding-y: 0.25rem !default;
-
-$modal-content-border-color: $border-color;
-$modal-header-padding: 1rem 1.25rem 0.5rem 1.25rem;
-$modal-inner-padding: 1rem 1.25rem 1rem 1.25rem;
+$dropdown-divider-bg: $gray-25 !default;
+$dropdown-divider-margin-y: 0.25rem !default;
+$dropdown-header-color: $gray-500 !default;
+
+$modal-backdrop-bg: $white !default;
+$modal-backdrop-opacity: 0.8 !default;
+$modal-content-border-color: $border-color !default;
+$modal-header-padding: 1rem 1.25rem 1rem 1.25rem !default;
+$modal-inner-padding: 1rem 1.25rem 1rem 1.25rem !default;
+$modal-fade-transform: translate(0, 0) !default;
+$modal-show-transform: none !default;
+$modal-transition: transform .2s ease-out !default;
+$modal-scale-transform: scale(1.02) !default;
+$modal-content-border-width: 0px !default;
+$modal-header-border-width: 1px !default;
+$modal-content-box-shadow-xs: rgba(0, 0, 0, 0.08) 0px 0px 0px 1px, rgba(0, 0, 0, 0.02) 0px 1px 1px 0px, rgba(0, 0, 0, 0.04) 0px 8px 16px -4px, rgba(0, 0, 0, 0.06) 0px 24px 32px -8px !default;
+$modal-content-box-shadow-sm-up: $modal-content-box-shadow-xs !default;
+$modal-footer-margin-between: 0 !default;
$alert-padding-y: 0.5rem !default;
$alert-padding-x: 1rem !default;
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index 3019ba254d..ae40a504c7 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -467,31 +467,6 @@ small,
.opacity-0 {
opacity: 0;
}
-.translate-x-6 {
- transform: translateX(6px);
-}
-.translate-x-0 {
- transform: translateX(0);
-}
-.transition {
- transition-property: color, background-color, border-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-text-decoration-color, -webkit-backdrop-filter;
- transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
- transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-text-decoration-color, -webkit-backdrop-filter;
- transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
- transition-duration: 150ms;
-}
-.duration-200 {
- transition-duration: 200ms;
-}
-
-
-.my-content {
- overflow: hidden;
- display: -webkit-box;
- -webkit-box-orient: vertical;
- -webkit-line-clamp: var(--read-more-line-clamp, 4);
-}
-
.blurred {
filter: opacity(50%);
diff --git a/admin/app/views/spree/admin/coupon_codes/_coupon_code.html.erb b/admin/app/views/spree/admin/coupon_codes/_coupon_code.html.erb
index cf2e3d08ac..9822600023 100644
--- a/admin/app/views/spree/admin/coupon_codes/_coupon_code.html.erb
+++ b/admin/app/views/spree/admin/coupon_codes/_coupon_code.html.erb
@@ -2,7 +2,7 @@
<td class="w-50">
<div data-controller="clipboard">
<code data-clipboard-target="source"><%= coupon_code[1].upcase %></code>
- <button type="button" class="btn btn-link p-1 ml-2 with-tip" data-action="clipboard#copy" title="<%= Spree.t('admin.copy_to_clipboard') %>">
+ <button type="button" class="btn btn-light p-1 ml-2 with-tip" data-action="clipboard#copy" title="<%= Spree.t('admin.copy_to_clipboard') %>">
<%= icon('copy-check', class: 'mr-0 font-size-sm') %>
</button>
</div>
diff --git a/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb b/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb
index c8e068f683..eb962e2803 100644
--- a/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb
+++ b/admin/app/views/spree/admin/dashboard/setup_tasks/_add_products.html.erb
@@ -18,5 +18,5 @@
<%= link_to_with_icon 'plus', Spree.t(:add_product), spree.new_admin_product_path, class: 'btn btn-primary', data: { turbo_frame: '_top' } if can?(:create, Spree::Product) %>
<%= render 'spree/admin/products/import_button' %>
- <%= invite_vendor_button(class: 'btn-light') if defined?(invite_vendor_button) %>
+ <%= invite_vendor_button(class: 'btn btn-light') if defined?(invite_vendor_button) %>
</div>
diff --git a/admin/app/views/spree/admin/shared/_alerts.html.erb b/admin/app/views/spree/admin/shared/_alerts.html.erb
index b17e2f596f..6bff9cc4e5 100644
--- a/admin/app/views/spree/admin/shared/_alerts.html.erb
+++ b/admin/app/views/spree/admin/shared/_alerts.html.erb
@@ -5,12 +5,7 @@
<div
data-controller="notification"
data-notification-delay-value="5000"
- data-transition-enter-from="opacity-0 translate-x-6"
- data-transition-enter-to="opacity-100 translate-x-0"
- data-transition-leave-from="opacity-100 translate-x-0"
- data-transition-leave-to="opacity-0 translate-x-6"
-
- class="transition transform duration-200 hidden alert d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">
+ class="animate__animated animate__fadeInDown animate__faster hidden alert d-flex align-items-center <%= admin_flash_class_for(msg_type) %> align-items-center" style="min-width: 300px; pointer-events: all;">
<div class="d-flex align-items-center justify-content-between w-100">
<div class="d-flex align-items-center justify-content-between">
<span><%= text %></span>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
index c21da582ab..1eabc973a7 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_store_dropdown.html.erb
@@ -47,6 +47,13 @@
<%= Spree.t(:new_user) %>
<% end if can?(:create, Spree.user_class) %>
+ <%= link_to spree.new_admin_promotion_path, class: 'dropdown-item' do %>
+ <%= icon 'discount' %>
+ <%= Spree.t(:new_promotion) %>
+ <% end if can?(:create, Spree::Promotion) %>
+
+ <%= invite_vendor_button(class: 'dropdown-item') if defined?(invite_vendor_button) %>
+
<% if can?(:create, Spree::Store) %>
<div class="dropdown-divider"></div>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_store_nav.html.erb
index af819f6dc8..cce3d7834f 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
@@ -158,10 +158,13 @@
<% end %>
<%= render 'spree/admin/shared/sidebar/custom_nav' %>
+
+ <li class="nav-item border-top border-top-dashed my-1"></li>
<%= render 'spree/admin/shared/sidebar/storefront_nav' %>
<%= render 'spree/admin/shared/sidebar/integrations_nav' %>
- <li class="nav-item border-top border-top-dashed pt-2">
+ <li class="nav-item border-top border-top-dashed my-1"></li>
+ <li class="nav-item">
<%= active_link_to_with_icon('settings', Spree.t(:settings), spree.edit_admin_store_path(section: 'general-settings'), class: 'nav-link', active: params[:section] == 'general-settings') %>
</li>
<% if defined?(current_account) && current_account.present? && can?(:manage, current_account) %>
diff --git a/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb b/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb
index 8b81c476da..1fffd5d1c5 100644
--- a/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb
+++ b/admin/app/views/spree/admin/shared/sidebar/_storefront_nav.html.erb
@@ -1,5 +1,5 @@
<% if can?(:manage, Spree::Theme) %>
- <li class="nav-item border-top border-top-dashed pt-2">
+ <li class="nav-item">
<% storefront_active = %w[themes posts post_categories pages storefront].include?(controller_name) %>
<%= active_link_to_with_icon('building-store', Spree.t('admin.storefront'), spree.admin_themes_path, class: 'nav-link', active: storefront_active) %>
diff --git a/admin/app/views/spree/admin/storefront/edit.html.erb b/admin/app/views/spree/admin/storefront/edit.html.erb
index 6c6cc43236..6270f71720 100644
--- a/admin/app/views/spree/admin/storefront/edit.html.erb
+++ b/admin/app/views/spree/admin/storefront/edit.html.erb
@@ -2,6 +2,10 @@
<%= Spree.t(:settings) %>
<% end %>
+<% content_for :title do %>
+ <%= Spree.t(:settings) %>
+<% end %>
+
<%= content_for(:page_actions) do %>
<%= link_to_edit_translations(@store, classes: 'btn btn-light') %>
<% end %>