Merge branch 'main' into fix-promotions-admin-ui-inconsistency

solidusio · Nov 18, 2024 · 9d41eea · 9d41eea
2 parents f7c3343 + 5b2e560
commit 9d41eea
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/.github/labeler.yml b/.github/labeler.yml
@@ -18,6 +18,16 @@
   - changed-files:
     - any-glob-to-any-file:
       - "admin/**/*"
+"changelog:solidus_promotions":
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - "promotions/**/*"
+"changelog:solidus_legacy_promotions":
+- any:
+  - changed-files:
+    - any-glob-to-any-file:
+      - "legacy_promotions/**/*"
 "changelog:solidus_sample":
 - any:
   - changed-files:
@@ -40,6 +50,8 @@
       - "!backend/**/*"
       - "!api/**/*"
       - "!admin/**/*"
+      - "!promotions/**/*"
+      - "!legacy_promotions/**/*"
       - "!sample/**/*"
       - "!lib/**/*"
       - "!README.md"

diff --git a/legacy_promotions/app/assets/stylesheets/solidus_legacy_promotions/promotions.scss b/legacy_promotions/app/assets/stylesheets/solidus_legacy_promotions/promotions.scss
@@ -1,3 +1,3 @@
-@import "spree/backend/themes/classic";
+@import "spree/backend/globals/variables";
 
 @import "solidus_legacy_promotions/promotions/edit";