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.

Improve admin sidebar, external links and hover CSS classes

Damian Legawiece992c31ebf34
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
index 1bb65e23d6..22e42ba247 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_buttons.scss
@@ -68,7 +68,7 @@ button[disabled] .show-when-enabled { display: none; }
.hover-light {
&:hover, &:focus {
- background-color: $dropdown-link-hover-bg;
+ background-color: $gray-25;
text-decoration: none;
}
}
diff --git a/admin/app/assets/stylesheets/spree/admin/components/_main.scss b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
index ae09a218a6..846526cf93 100644
--- a/admin/app/assets/stylesheets/spree/admin/components/_main.scss
+++ b/admin/app/assets/stylesheets/spree/admin/components/_main.scss
@@ -76,7 +76,6 @@
background-color: $sidebar-bg;
box-shadow: inset -1px 0 0 $border-color;
height: calc(100vh - $header-height);
- overflow-y: auto;
overflow-x: hidden;
position: fixed;
top: $header-height;
diff --git a/admin/app/helpers/spree/admin/navigation_helper.rb b/admin/app/helpers/spree/admin/navigation_helper.rb
index 6685c492f1..cd2cd61b81 100644
--- a/admin/app/helpers/spree/admin/navigation_helper.rb
+++ b/admin/app/helpers/spree/admin/navigation_helper.rb
@@ -231,7 +231,7 @@ module Spree
link_to url, opts, &block
else
link_to url, opts do
- (label + icon('external-link', class: 'ml-1 mr-0 small')).html_safe
+ (label + icon('external-link', class: 'ml-1 mr-0 small opacity-50')).html_safe
end
end
end
diff --git a/admin/app/views/spree/admin/shared/_sidebar.html.erb b/admin/app/views/spree/admin/shared/_sidebar.html.erb
index 08452c27ce..1aabb91294 100644
--- a/admin/app/views/spree/admin/shared/_sidebar.html.erb
+++ b/admin/app/views/spree/admin/shared/_sidebar.html.erb
@@ -1,4 +1,4 @@
-<aside id="main-sidebar">
+<aside id="main-sidebar" class="overflow-y-auto">
<% if defined?(current_vendor) && current_vendor.present? %>
<%= render 'spree/admin/shared/sidebar/vendor_nav' %>
<% else %>
diff --git a/admin/app/views/spree/admin/shared/_user.html.erb b/admin/app/views/spree/admin/shared/_user.html.erb
index 023dd5aa82..b9654d2ccc 100644
--- a/admin/app/views/spree/admin/shared/_user.html.erb
+++ b/admin/app/views/spree/admin/shared/_user.html.erb
@@ -1,4 +1,4 @@
-<%= link_to spree.admin_user_path(user), class: 'rounded p-2 d-flex justify-content-start align-items-center', data: {turbo_frame: :_top, row_link_target: :link} do %>
+<%= link_to spree.admin_user_path(user), class: 'rounded p-2 d-flex justify-content-start align-items-center text-decoration-none hover-light', data: {turbo_frame: :_top, row_link_target: :link} do %>
<% if user.name.present? %>
<%= render_avatar(user, width: 48, height: 48, class: 'mr-3 avatar') %>
<% else %>