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.

UI improvements

Damian Legawiec041e45199d8c
diff --git a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
index 1defcd110e..37e8f1d568 100644
--- a/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
+++ b/admin/app/assets/stylesheets/spree/admin/global/_variables.scss
@@ -147,6 +147,10 @@ $dropdown-padding-y: 0.25rem !default;
$modal-header-padding: 1rem 1.5rem 0.5rem 1.5rem;
$modal-inner-padding: 1rem 1.5rem 1rem 1.5rem;
+$alert-padding-y: 0.5rem !default;
+$alert-padding-x: 1rem !default;
+$alert-border-radius: $border-radius-lg;
+
label {
font-size: 100%;
}
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
index 9858d0d275..e9deea599a 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_base.scss
@@ -761,3 +761,7 @@ div.uppy-Root {
.rounded-lg {
border-radius: $border-radius-lg;
}
+
+.turbo-progress-bar {
+ background-color: theme-color('blue');
+}
\ No newline at end of file
diff --git a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
index 827e60038f..bc95d88380 100644
--- a/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
+++ b/admin/app/assets/stylesheets/spree/admin/shared/_forms.scss
@@ -71,7 +71,7 @@ input[type="file"] {
.option {
@extend .p-2;
- @extend .rounded;
+ @extend .rounded-sm;
}
.ts-dropdown-content {
diff --git a/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb b/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb
index d81b50cd64..64da5531f4 100644
--- a/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb
+++ b/admin/app/views/spree/admin/page_sections/forms/_image_with_text.html.erb
@@ -13,9 +13,9 @@
<div class="custom-control custom-checkbox pb-2">
<%= lf.check_box :open_in_new_tab, class: 'custom-control-input', data: { action: 'auto-submit#submit' } %>
<%= lf.label :open_in_new_tab, class: 'custom-control-label' %>
+ <span class="text-muted form-text mt-2">Clicking on the image will send the user to the selected page/URL</span>
</div>
<% end %>
- <div class="alert alert-info">Clicking on the image will send the user to the selected page/URL</div>
</div>
<% content_for(:design_tab) do %>
diff --git a/admin/app/views/spree/admin/shared/_alerts.html.erb b/admin/app/views/spree/admin/shared/_alerts.html.erb
index bd8ae57073..b17e2f596f 100644
--- a/admin/app/views/spree/admin/shared/_alerts.html.erb
+++ b/admin/app/views/spree/admin/shared/_alerts.html.erb
@@ -15,11 +15,9 @@
<div class="d-flex align-items-center justify-content-between">
<span><%= text %></span>
</div>
- <div class="ml-3">
- <button type="button" class="btn" data-action="notification#hide" aria-label="<%= Spree.t(:close) %>">
- <%= icon('x', height: 20, class: 'mr-0') %>
- </button>
- </div>
+ <button type="button" class="btn ml-3 p-1" data-action="notification#hide" aria-label="<%= Spree.t(:close) %>">
+ <%= icon('x', height: 20, class: 'mr-0') %>
+ </button>
</div>
</div>
</div>
diff --git a/admin/app/views/spree/admin/users/edit.html.erb b/admin/app/views/spree/admin/users/edit.html.erb
index bb565220cf..f85a3d3de9 100644
--- a/admin/app/views/spree/admin/users/edit.html.erb
+++ b/admin/app/views/spree/admin/users/edit.html.erb
@@ -3,6 +3,6 @@
<%= form_for [:admin, @user], as: :user, url: spree.admin_user_path(@user), method: :put do |f| %>
<%= render 'form', f: f %>
- <%= render 'spree/admin/shared/edit_resource_links', f: f %>
+ <%= render 'spree/admin/shared/edit_resource_links', f: f, turbo_frame: '_top' %>
<% end %>
<% end %>
\ No newline at end of file