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 CSS and try fix spec language issue.

Matthew Kennedy51cec8959071
diff --git a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
index d25cc6ac5a..3910e71599 100644
--- a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
+++ b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
@@ -89,17 +89,15 @@ button#cmsSectionEditorFullScreen {
#pageLivePreview {
transform-origin: top left;
+ background: rgb(62, 62, 62);
}
.desktopLiveView {
#pageLivePreview {
- width: 200%;
- height:200%;
- top: 0%;
- left: 50%;
- bottom: 0%;
- right: 50%;
- transform: scale(0.5) translate(-50%);
+ width: 200.5%;
+ height:200.5%;
+ inset: 50%;
+ transform: scale(0.5) translate(-50%, -50%);
max-width: 2600px;
}
}
@@ -107,12 +105,9 @@ button#cmsSectionEditorFullScreen {
.tabletLiveView {
#pageLivePreview {
width: 85%;
- height: 133%;
- top: 0%;
- left: 50%;
- bottom: 0%;
- right: 50%;
- transform: scale(0.75) translate(-50%);
+ height: 133.5%;
+ inset: 50%;
+ transform: scale(0.75) translate(-50%, -50%);
max-width: 991px;
min-width: 768px;
}
@@ -121,12 +116,9 @@ button#cmsSectionEditorFullScreen {
.mobileLiveView {
#pageLivePreview {
width: 60%;
- height: 133%;
- top: 0%;
- left: 50%;
- bottom: 0%;
- right: 50%;
- transform: scale(0.75) translate(-50%);
+ height: 133.5%;
+ inset: 50%;
+ transform: scale(0.75) translate(-50%, -50%);
max-width: 767px;
min-width: 375px;
}
diff --git a/frontend/spec/features/products_filtering_spec.rb b/frontend/spec/features/products_filtering_spec.rb
index 67897ae4ae..e26a04c5b5 100644
--- a/frontend/spec/features/products_filtering_spec.rb
+++ b/frontend/spec/features/products_filtering_spec.rb
@@ -131,7 +131,7 @@ describe 'Products filtering', :js do
let!(:length) { create :option_type, name: 'length', presentation: 'Length', filterable: true }
let!(:mini_length) { create :option_value, option_type: length, name: 'mini', presentation: 'MINI' }
- let!(:product_3) { create :product, stores: [create(:store)], taxons: [taxon], option_types: [length] }
+ let!(:product_3) { create :product, stores: [create(:store, default: true)], taxons: [taxon], option_types: [length] }
let!(:variant_3) { create :variant, product: product_3, option_values: [mini_length] }
it 'does not display option types for products assigned to the other store' do
@@ -160,7 +160,7 @@ describe 'Products filtering', :js do
let!(:material) { create :property, :material, filterable: true }
let!(:cotton_material) { create :product_property, value: 'Cotton', property: material }
- let!(:product_3) { create :product, stores: [create(:store)], taxons: [taxon], product_properties: [cotton_material] }
+ let!(:product_3) { create :product, stores: [create(:store, default: true)], taxons: [taxon], product_properties: [cotton_material] }
it 'does not display properties for products assigned to the other store' do
visit spree.nested_taxons_path(taxon)