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.

Refactor of assets to all be under the name space of menu / menus.

Matthew Kennedybf259a3d95c3
diff --git a/backend/app/assets/javascripts/spree/backend.js b/backend/app/assets/javascripts/spree/backend.js
index 470a1d11ec..916b21d89c 100644
--- a/backend/app/assets/javascripts/spree/backend.js
+++ b/backend/app/assets/javascripts/spree/backend.js
@@ -45,8 +45,7 @@
//= require spree/backend/product_picker
//= require spree/backend/progress
//= require spree/backend/promotions
-//= require spree/backend/navigation/menu_item
-//= require spree/backend/navigation/menu
+//= require spree/backend/menus/index
//= require spree/backend/returns/expedited_exchanges_warning
//= require spree/backend/returns/return_item_selection
//= require spree/backend/shipments
diff --git a/backend/app/assets/javascripts/spree/backend/menus/index.es6 b/backend/app/assets/javascripts/spree/backend/menus/index.es6
new file mode 100644
index 0000000000..862de047c5
--- /dev/null
+++ b/backend/app/assets/javascripts/spree/backend/menus/index.es6
@@ -0,0 +1,2 @@
+//= require spree/backend/menus/menu
+//= require spree/backend/menus/menu_item
diff --git a/backend/app/assets/javascripts/spree/backend/navigation/menu.es6 b/backend/app/assets/javascripts/spree/backend/menus/menu.es6
similarity index 100%
rename from backend/app/assets/javascripts/spree/backend/navigation/menu.es6
rename to backend/app/assets/javascripts/spree/backend/menus/menu.es6
diff --git a/backend/app/assets/javascripts/spree/backend/navigation/menu_item.es6 b/backend/app/assets/javascripts/spree/backend/menus/menu_item.es6
similarity index 100%
rename from backend/app/assets/javascripts/spree/backend/navigation/menu_item.es6
rename to backend/app/assets/javascripts/spree/backend/menus/menu_item.es6
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
index c3d8dca866..814240088b 100644
--- a/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
+++ b/backend/app/assets/stylesheets/spree/backend/components/_tables.scss
@@ -134,7 +134,3 @@ div.table-responsive table.table-bordered {
}
}
}
-
-.move-handle {
- cursor: grab;
-}
diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_base.scss b/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
index 768ecdac14..c0ec658bb5 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
+++ b/backend/app/assets/stylesheets/spree/backend/shared/_base.scss
@@ -32,8 +32,6 @@
display: inline-block;
}
-.truncate {
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
+.move-handle {
+ cursor: grab;
}
diff --git a/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss b/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss
index 8e305e5d36..512b9caf80 100644
--- a/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss
+++ b/backend/app/assets/stylesheets/spree/backend/spree_admin.css.scss
@@ -4,7 +4,6 @@
@import 'bootstrap';
@import 'glyphicons';
@import 'shared/glyphicons_urls_fix';
-@import 'shared/sortable_js_tree';
@import 'components/navbar';
@import 'components/sidebar';
@@ -29,6 +28,7 @@
@import 'shared/base';
@import 'shared/forms';
+@import 'views/menus';
@import 'views/order_payments';
@import 'views/product_properties';
@import 'views/prototypes';
diff --git a/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss b/backend/app/assets/stylesheets/spree/backend/views/_menus.scss
similarity index 81%
rename from backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
rename to backend/app/assets/stylesheets/spree/backend/views/_menus.scss
index ab46834be2..74e9a931e5 100644
--- a/backend/app/assets/stylesheets/spree/backend/shared/_sortable_js_tree.scss
+++ b/backend/app/assets/stylesheets/spree/backend/views/_menus.scss
@@ -1,7 +1,3 @@
-$item-padding: 0;
-$main-items-border-color: rgba(0, 0, 0, 0.125);
-$nestable-background-color: rgb(214, 214, 214);
-
#menuArea {
.space-buttons {
box-shadow: -11px 0 16px 6px white;
@@ -12,7 +8,7 @@ $nestable-background-color: rgb(214, 214, 214);
}
.container-item-row {
overflow: hidden;
- border: 1px solid $main-items-border-color;
+ border: 1px solid $border-color;
margin: 2px;
background-color: white;
}
@@ -41,7 +37,7 @@ $nestable-background-color: rgb(214, 214, 214);
.menu_items_image_holder {
position: relative;
- border: 1px solid $main-items-border-color;
+ border: 1px solid $border-color;
border-radius: 7px;
overflow: hidden;
width: 45px;