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 tweaks.

Matthew Kennedy43d63c63e6ba
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 09f4be64b0..630a4b3c09 100644
--- a/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
+++ b/backend/app/assets/stylesheets/spree/backend/views/_cms_pages.scss
@@ -98,10 +98,6 @@ button#cmsSectionEditorFullScreen {
.edge {
padding-left: 0;
padding-right: 0;
-
- div.row {
-
- }
}
.cms_section_action_col {
@@ -178,3 +174,18 @@ body.cmsSectionFullScreenMode {
left: 28%;
}
}
+
+// ToDo: Fix zoom state on difrent screen sizes
+// To get optimal use from the Live Editor Preview.
+// Bootstrap media break points are not going to be suitable as
+// it is in frame in a screen.
+// @include media-breakpoint-up(lg) {
+// .desktopLiveView {
+// #pageLivePreview {
+// width: 125%;
+// height: 100%;
+// transform: scale(0.75);
+
+// }
+// }
+// }
diff --git a/backend/app/views/spree/admin/cms_pages/_form.html.erb b/backend/app/views/spree/admin/cms_pages/_form.html.erb
index 93c0c49d65..30c0454f64 100644
--- a/backend/app/views/spree/admin/cms_pages/_form.html.erb
+++ b/backend/app/views/spree/admin/cms_pages/_form.html.erb
@@ -39,7 +39,7 @@
<div class="card-body pb-2">
<div class="row pb-0">
- <%= f.field_container :title, class: ['form-group col-6'] do %>
+ <%= f.field_container :title, class: ['form-group col-12 col-md-6'] do %>
<%= f.label :title, raw(Spree.t('admin.cms.title') + required_span_tag) %>
<%= f.text_field :title, class: 'form-control', required: true %>
<%= f.error_message_on :title %>
@@ -101,14 +101,14 @@
<% unless %w[new create].include? controller.action_name %>
<div class="row pb-0">
<% if @cms_page.type != 'Spree::Cms::Pages::StandardPage' %>
- <div class="col-6">
+ <div class="col-12 col-md-6">
<%= render partial: 'spree/admin/shared/edit_resource_links' %>
</div>
<% else %>
<div class="col"></div>
<% end %>
- <div class="col-6 text-right">
+ <div class="col-12 col-md text-right pt-3 pt-md-0">
<button class="btn btn-outline-secondary" type="button" data-toggle="collapse" data-target="#cmsSeoSettings" aria-expanded="false" aria-controls="collapseExample">
<%= raw Spree.t('admin.cms.more_page_settings') %>
</button>
diff --git a/backend/app/views/spree/admin/cms_sections/types/_brands.html.erb b/backend/app/views/spree/admin/cms_sections/types/_brands.html.erb
index 5bb3c6ceb6..1958677fbf 100644
--- a/backend/app/views/spree/admin/cms_sections/types/_brands.html.erb
+++ b/backend/app/views/spree/admin/cms_sections/types/_brands.html.erb
@@ -11,5 +11,22 @@
<%= f.text_field :subtitle, class: 'form-control' %>
<%= f.error_message_on :subtitle %>
<% end %>
+
+ <%= f.field_container :fit, class: ['form-group'] do %>
+ <%= f.label :fit, Spree.t('admin.cms.fit') %>
+ <%= f.select(:fit, @cms_section.boundaries, {include_blank: false}, class: 'select2') %>
+ <%= f.error_message_on :fit %>
+ <% end %>
+ </div>
+ <div class="col-6">
+ <div class="alert alert-info mt-4">
+ Create a Branding Menu with the following settings
+ </div>
+ <span class="badge badge-secondary mx-2">
+ <%= svg_icon name: "store.svg", width: '18', height: '18' %> <%= @cms_section.cms_page.store.unique_name %>
+ </span>
+ <span class="badge badge-secondary">
+ <%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_section.cms_page.locale) %>
+ </span>
</div>
</div>
diff --git a/frontend/app/views/spree/shared/cms/sections/_taxon_category.html.erb b/frontend/app/views/spree/shared/cms/sections/_taxon_category.html.erb
index 672ae44d4a..d8b6ae9118 100644
--- a/frontend/app/views/spree/shared/cms/sections/_taxon_category.html.erb
+++ b/frontend/app/views/spree/shared/cms/sections/_taxon_category.html.erb
@@ -1,81 +1,85 @@
-<div class="col-6 mb-3">
- <%= link_to spree.nested_taxons_path(section.title), class: "homepage-taxon-box mb-3" do %>
+<div class="col-12">
+ <div class="row">
+ <div class="col-6 mb-3">
+ <%= link_to spree.nested_taxons_path(section.title), class: "homepage-taxon-box mb-3" do %>
- <% if section.image_one.attached? && section.image_one.variable? %>
- <!-- XS to MD -->
- <img class="d-md-none lazyload"
- data-src="<%= main_app.url_for(section.image_one.attachment.variant(resize: '387x250>')) %>"
- data-srcset="<%= main_app.url_for(section.image_one.attachment.variant(resize: '387x250>')) %>"
- alt="<%= section.title %>">
+ <% if section.image_one.attached? && section.image_one.variable? %>
+ <!-- XS to MD -->
+ <img class="d-md-none lazyload"
+ data-src="<%= main_app.url_for(section.image_one.attachment.variant(resize: '387x250>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_one.attachment.variant(resize: '387x250>')) %>"
+ alt="<%= section.title %>">
- <!-- MD to XL -->
- <img class="d-none d-md-block d-xl-none lazyload"
- data-src="<%= main_app.url_for(section.image_one.attachment.variant(resize: '734x476>')) %>"
- data-srcset="<%= main_app.url_for(section.image_one.attachment.variant(resize: '734x476>')) %>"
- alt="<%= section.title %>">
+ <!-- MD to XL -->
+ <img class="d-none d-md-block d-xl-none lazyload"
+ data-src="<%= main_app.url_for(section.image_one.attachment.variant(resize: '734x476>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_one.attachment.variant(resize: '734x476>')) %>"
+ alt="<%= section.title %>">
- <!-- XL UP -->
- <img class="d-none d-xl-block lazyload"
- data-src="<%= main_app.url_for(section.image_one.attachment.variant(resize: '1468x952>')) %>"
- data-srcset="<%= main_app.url_for(section.image_one.attachment.variant(resize: '1468x952>')) %>"
- alt="<%= section.title %>">
- <% end %>
+ <!-- XL UP -->
+ <img class="d-none d-xl-block lazyload"
+ data-src="<%= main_app.url_for(section.image_one.attachment.variant(resize: '1468x952>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_one.attachment.variant(resize: '1468x952>')) %>"
+ alt="<%= section.title %>">
+ <% end %>
- <div class="homepage-taxon-box-text ">
- <h3 class="homepage-hpb"><%= section.title %></h3>
- </div>
- <% end %>
- <%= link_to spree.nested_taxons_path(section.button_text), class: "homepage-taxon-box" do %>
- <% if section.image_three.attached? && section.image_three.variable? %>
- <!-- XS to MD -->
- <img class="d-md-none lazyload"
- data-src="<%= main_app.url_for(section.image_three.attachment.variant(resize: '387x250>')) %>"
- data-srcset="<%= main_app.url_for(section.image_three.attachment.variant(resize: '387x250>')) %>"
- alt="<%= section.button_text %>">
+ <div class="homepage-taxon-box-text ">
+ <h3 class="homepage-hpb"><%= section.title %></h3>
+ </div>
+ <% end %>
+ <%= link_to spree.nested_taxons_path(section.button_text), class: "homepage-taxon-box" do %>
+ <% if section.image_three.attached? && section.image_three.variable? %>
+ <!-- XS to MD -->
+ <img class="d-md-none lazyload"
+ data-src="<%= main_app.url_for(section.image_three.attachment.variant(resize: '387x250>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_three.attachment.variant(resize: '387x250>')) %>"
+ alt="<%= section.button_text %>">
- <!-- MD to XL -->
- <img class="d-none d-md-block d-xl-none lazyload"
- data-src="<%= main_app.url_for(section.image_three.attachment.variant(resize: '734x476>')) %>"
- data-srcset="<%= main_app.url_for(section.image_three.attachment.variant(resize: '734x476>')) %>"
- alt="<%= section.button_text %>">
+ <!-- MD to XL -->
+ <img class="d-none d-md-block d-xl-none lazyload"
+ data-src="<%= main_app.url_for(section.image_three.attachment.variant(resize: '734x476>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_three.attachment.variant(resize: '734x476>')) %>"
+ alt="<%= section.button_text %>">
- <!-- XL UP -->
- <img class="d-none d-xl-block lazyload"
- data-src="<%= main_app.url_for(section.image_three.attachment.variant(resize: '1468x952>')) %>"
- data-srcset="<%= main_app.url_for(section.image_three.attachment.variant(resize: '1468x952>')) %>"
- alt="<%= section.button_text %>">
- <% end %>
+ <!-- XL UP -->
+ <img class="d-none d-xl-block lazyload"
+ data-src="<%= main_app.url_for(section.image_three.attachment.variant(resize: '1468x952>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_three.attachment.variant(resize: '1468x952>')) %>"
+ alt="<%= section.button_text %>">
+ <% end %>
- <div class="homepage-taxon-box-text" role="img" aria-label="Sportswear">
- <h3 class="homepage-hpb"><%= section.button_text %></h3>
+ <div class="homepage-taxon-box-text" role="img" aria-label="Sportswear">
+ <h3 class="homepage-hpb"><%= section.button_text %></h3>
+ </div>
+ <% end %>
</div>
- <% end %>
-</div>
-<div class="col-6 mb-3 d-flex flex-column">
- <%= link_to spree.nested_taxons_path(section.subtitle), class: "homepage-taxon-box flex-grow-1" do %>
- <% if section.image_two.attached? && section.image_two.variable? %>
- <!-- XS to MD -->
- <img class="d-md-none lazyload"
- data-src="<%= main_app.url_for(section.image_two.variant(resize: '387x250>')) %>"
- data-srcset="<%= main_app.url_for(section.image_two.variant(resize: '387x250>')) %>"
- alt="<%= section.subtitle %>">
+ <div class="col-6 mb-3 d-flex flex-column">
+ <%= link_to spree.nested_taxons_path(section.subtitle), class: "homepage-taxon-box flex-grow-1" do %>
+ <% if section.image_two.attached? && section.image_two.variable? %>
+ <!-- XS to MD -->
+ <img class="d-md-none lazyload"
+ data-src="<%= main_app.url_for(section.image_two.variant(resize: '387x250>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_two.variant(resize: '387x250>')) %>"
+ alt="<%= section.subtitle %>">
- <!-- MD to XL -->
- <img class="d-none d-md-block d-xl-none lazyload"
- data-src="<%= main_app.url_for(section.image_two.variant(resize: '734x476>')) %>"
- data-srcset="<%= main_app.url_for(section.image_two.variant(resize: '734x476>')) %>"
- alt="<%= section.subtitle %>">
+ <!-- MD to XL -->
+ <img class="d-none d-md-block d-xl-none lazyload"
+ data-src="<%= main_app.url_for(section.image_two.variant(resize: '734x476>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_two.variant(resize: '734x476>')) %>"
+ alt="<%= section.subtitle %>">
- <!-- XL UP -->
- <img class="d-none d-xl-block lazyload"
- data-src="<%= main_app.url_for(section.image_two.variant(resize: '1468x952>')) %>"
- data-srcset="<%= main_app.url_for(section.image_two.variant(resize: '1468x952>')) %>"
- alt="<%= section.subtitle %>">
- <% end %>
+ <!-- XL UP -->
+ <img class="d-none d-xl-block lazyload"
+ data-src="<%= main_app.url_for(section.image_two.variant(resize: '1468x952>')) %>"
+ data-srcset="<%= main_app.url_for(section.image_two.variant(resize: '1468x952>')) %>"
+ alt="<%= section.subtitle %>">
+ <% end %>
- <div class="homepage-taxon-box-text">
- <h3 class="homepage-hpb"><%= section.subtitle %></h3>
+ <div class="homepage-taxon-box-text">
+ <h3 class="homepage-hpb"><%= section.subtitle %></h3>
+ </div>
+ <% end %>
</div>
- <% end %>
+ </div>
</div>