Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Nordic Editorial storefront theme (#852)
Krzysztof Pajak9abfd1a5b8b0
diff --git a/GrandNode.slnx b/GrandNode.slnxindex b88014aef..6fd7cef09 100644--- a/GrandNode.slnx+++ b/GrandNode.slnx@@ -48,6 +48,7 @@<Project Path="src/Plugins/Tax.CountryStateZip/Tax.CountryStateZip.csproj" /><Project Path="src/Plugins/Tax.FixedRate/Tax.FixedRate.csproj" /><Project Path="src/Plugins/Theme.Modern/Theme.Modern.csproj" />+ <Project Path="src/Plugins/Theme.Nordic/Theme.Nordic.csproj" /><Project Path="src/Plugins/Widgets.FacebookPixel/Widgets.FacebookPixel.csproj" /><Project Path="src/Plugins/Widgets.GoogleAnalytics/Widgets.GoogleAnalytics.csproj" /><Project Path="src/Plugins/Widgets.Slider/Widgets.Slider.csproj" />diff --git a/src/Modules/Grand.Module.Installer/Services/InstallDataPages.cs b/src/Modules/Grand.Module.Installer/Services/InstallDataPages.csindex 83a26c206..3cf33fef3 100644--- a/src/Modules/Grand.Module.Installer/Services/InstallDataPages.cs+++ b/src/Modules/Grand.Module.Installer/Services/InstallDataPages.cs@@ -194,6 +194,19 @@ public partial class InstallationService}};+ //the promo line in the header bar of the Nordic theme - sample copy, so sample installs only;+ //the theme leaves the bar out when this page does not exist+ if (installSampleData)+ pages.Add(new Page {+ SystemName = "HeaderPromoText",+ IncludeInSitemap = false,+ IsPasswordProtected = false,+ DisplayOrder = 1,+ Title = "",+ Body = "<p>Free shipping on orders over $75 · 30-day returns</p>",+ PageLayoutId = defaultPageLayout.Id,+ Published = true+ });pages.ForEach(x => _pageRepository.Insert(x));var lpages = from p in _pageRepository.Tablediff --git a/src/Modules/Grand.Module.Installer/Services/InstallDataSettings.cs b/src/Modules/Grand.Module.Installer/Services/InstallDataSettings.csindex 0aa0e11b0..b772171f4 100644--- a/src/Modules/Grand.Module.Installer/Services/InstallDataSettings.cs+++ b/src/Modules/Grand.Module.Installer/Services/InstallDataSettings.cs@@ -27,7 +27,11 @@ public partial class InstallationService{protected virtual async Task InstallSettings(bool installSampleData){- var path = Path.Combine(_hostingEnvironment.WebRootPath, "logo.png");+ //sample installs open in the Nordic theme; its logo is a warm mid tone that stays legible+ //on both its light and dark scheme, where the stock teal-on-white logo loses half its lettering+ var path = installSampleData+ ? Path.Combine(_hostingEnvironment.WebRootPath, "assets", "samples", "logo_nordic.png")+ : Path.Combine(_hostingEnvironment.WebRootPath, "logo.png");var storePictureId = (await _pictureRepository.InsertPicture(await File.ReadAllBytesAsync(path), "image/png", "Logo")).Id;@@ -319,7 +323,8 @@ public partial class InstallationServiceawait _settingRepository.SaveSetting(new StoreInformationSettings {LogoPictureId = storePictureId,StoreClosed = false,- DefaultStoreTheme = "Default",+ //the sample store is presented in the Nordic Editorial theme; a plain install stays on Default+ DefaultStoreTheme = installSampleData ? "Nordic" : "Default",AllowCustomerToSelectTheme = false,DisplayCookieInformation = false,FacebookLink = "https://www.facebook.com/grandnodecom",diff --git a/src/Plugins/Theme.Nordic/Content/css/account-cart.css b/src/Plugins/Theme.Nordic/Content/css/account-cart.cssnew file mode 100644index 000000000..a24ee8a9e--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/account-cart.css@@ -0,0 +1,194 @@+/*+ Nordic Editorial - account, cart, checkout, order details, compare and wishlist.+ CSS only: tokens, buttons, forms and tables; no layout changes to the Default views.+*/++/* ---------- account pages and login ---------- */++.block-account-navigation .list-group-item,+[dark-theme="true"] .block-account-navigation .list-group-item {+ padding: 10px 0;+ background: transparent;+ border: 0;+ border-bottom: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+ font-size: 14px;+}++.block-account-navigation .list-group-item.active,+.block-account-navigation .list-group-item:hover,+.block-account-navigation a.active {+ background: transparent;+ color: var(--nordic-ink);+ font-weight: 600;+ text-decoration: underline;+ text-underline-offset: .25em;+}++.login-page .card,+.registration-page .card,+.account-page .card,+.checkout-page .card,+.order-details-page .card,+[dark-theme="true"] .login-page .card,+[dark-theme="true"] .account-page .card,+[dark-theme="true"] .checkout-page .card {+ background: transparent;+ border: 1px solid var(--nordic-line);+}++.login-page .card-header,+.registration-page .card-header,+.account-page .card-header,+.checkout-page .card-header,+.order-details-page .card-header {+ background: var(--nordic-surface);+ border-bottom: 1px solid var(--nordic-line);+}++.login-page .card-header .h5,+.login-page .card-header h2,+.checkout-page .card-header .h5,+.checkout-page .card-header h2 {+ font-family: var(--nordic-serif);+ font-size: 1.25rem;+ font-weight: 400;+}++/* ---------- cart, wishlist, compare tables ---------- */++.shopping-cart,+.shopping-cart.table,+[dark-theme="true"] .shopping-cart,+[dark-theme="true"] .shopping-cart.table td {+ background: transparent;+ border-color: var(--nordic-line);+ color: var(--nordic-ink);+}++.shopping-cart .product-picture img,+.shopping-cart-container .product-picture img {+ width: 80px;+ height: 100px;+ object-fit: cover;+ background: var(--nordic-surface);+}++.shopping-cart a.product-name,+.shopping-cart .product-name a,+.shopping-cart-container .product a {+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: 16px;+ text-decoration: none;+}++.shopping-cart .unit-price,+.shopping-cart .subtotal,+.shopping-cart .prod-total {+ color: var(--nordic-ink);+ font-weight: 500;+}++.shopping-cart .qty-input {+ max-width: 70px;+ margin: 0 auto;+}++.shopping-cart .attributes,+.shopping-cart .sku-number,+.shopping-cart-container .attributes,+.shopping-cart-container .attributes.small,+.b-sidebar .item .attributes {+ color: var(--nordic-muted-text);+}++/* totals: a quiet panel on the surface colour */+.totals .totals-inner,+.cart-footer .totals,+.order-summary-content .totals {+ padding: 20px;+ background: var(--nordic-surface);+ border: 0;+}++.totals .table,+.totals table {+ --bs-table-bg: transparent;+ margin: 0;+}++.totals .order-total,+.totals .order-total td,+.totals tr:last-child td {+ font-family: var(--nordic-serif);+ font-size: 1.2rem;+}++.checkout-buttons .btn {+ min-height: 46px;+}++.checkout-buttons .checkout-button {+ padding-left: 2rem;+ padding-right: 2rem;+}++/* discount, gift voucher, estimate shipping boxes */+.cart-footer .card,+.shopping-cart-container .card,+[dark-theme="true"] .cart-footer .card {+ background: transparent;+ border: 1px solid var(--nordic-line);+}++/* ---------- checkout ---------- */++.checkout-page .checkout-data {+ color: var(--nordic-ink);+}++.checkout-page .nav-pills .nav-link,+.checkout-page .checkout-steps .step {+ border-radius: 0;+ color: var(--nordic-muted-text);+ font-size: 11px;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.checkout-page .nav-pills .nav-link.active {+ background: var(--nordic-ink);+ color: var(--nordic-bg);+}++.checkout-page .form-check-label,+.checkout-page .method-name {+ color: var(--nordic-ink);+}++/* ---------- order details and lists ---------- */++.order-details-page .generalTitle,+.order-list-page .generalTitle,+.checkout-page .generalTitle {+ text-align: left;+}++.order-completed-page .generalTitle {+ font-size: clamp(2rem, 1.5rem + 1.6vw, 2.6rem);+ font-weight: 300;+}++/* ---------- compare ---------- */++.compare-products-table,+[dark-theme="true"] .compare-products-table {+ --bs-table-bg: transparent;+ color: var(--nordic-ink);+}++.compare-products-table img {+ aspect-ratio: 4 / 5;+ object-fit: cover;+}diff --git a/src/Plugins/Theme.Nordic/Content/css/base.css b/src/Plugins/Theme.Nordic/Content/css/base.cssnew file mode 100644index 000000000..45eee3cd8--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/base.css@@ -0,0 +1,511 @@+/*+ Nordic Editorial - base layer: page, type, buttons, forms, cards, tables.++ Loaded after the Default stylesheets (see Views/Nordic/Shared/Partials/Head.cshtml), so equal+ specificity wins by order. !important only where the Default rule it answers uses it.+*/++/* ---------- page ---------- */++body,+body[dark-theme="true"],+#app,+#app[dark-theme="true"] {+ background-color: var(--nordic-bg);+ color: var(--nordic-ink);+ font-family: var(--nordic-sans);+}++body {+ -webkit-font-smoothing: antialiased;+ -moz-osx-font-smoothing: grayscale;+}++a,+[dark-theme="true"] a {+ color: var(--nordic-ink);+}++a:hover,+a:focus-visible,+[dark-theme="true"] a:hover {+ color: var(--nordic-muted-text);+}++::selection {+ background: var(--nordic-ink);+ color: var(--nordic-bg);+}++:focus-visible {+ outline: 2px solid var(--nordic-ink);+ outline-offset: 2px;+}++hr {+ border-color: var(--nordic-line);+ opacity: 1;+}++.date-text,+[dark-theme="true"] .date-text,+.text-muted,+[dark-theme="true"] .text-muted,+[dark-theme="true"] .b-sidebar .text-muted {+ color: var(--nordic-muted-text) !important;+}++.text-dark,+[dark-theme="true"] .text-dark,+.text-info,+[dark-theme="true"] .text-info {+ color: var(--nordic-ink) !important;+}++.bg-white,+[dark-theme="true"] .bg-white,+.bg-light,+[dark-theme="true"] .bg-light,+[dark-theme="true"] .jumbotron {+ background-color: var(--nordic-bg) !important;+}++/* ---------- type ---------- */++h1, h2, h3, h4,+.h1, .h2, .h3, .h4,+.generalTitle,+.page-title,+.page-title h1,+.page-title h2 {+ font-family: var(--nordic-serif);+ font-weight: 350;+ letter-spacing: -.01em;+ color: var(--nordic-ink);+}++h5, h6, .h5, .h6 {+ font-family: var(--nordic-sans);+ font-weight: 600;+}++h1, .h1, .page-title h1 {+ font-size: clamp(1.9rem, 1.4rem + 1.6vw, 2.75rem);+ line-height: 1.12;+}++h2, .h2, .generalTitle {+ font-size: clamp(1.5rem, 1.2rem + 1vw, 2rem);+ line-height: 1.2;+}++b, strong, .font-weight-bold, .fw-bold {+ font-weight: 600;+}++.nordic-kicker {+ font-family: var(--nordic-sans);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: var(--nordic-track);+ text-transform: uppercase;+ color: var(--nordic-muted-text);+}++.nordic-serif {+ font-family: var(--nordic-serif);+ font-weight: 350;+}++/* ---------- buttons ---------- */++.btn {+ --bs-btn-border-radius: 0;+ --bs-btn-font-size: 12px;+ --bs-btn-font-weight: 600;+ --bs-btn-padding-x: 1.25rem;+ --bs-btn-padding-y: .7rem;+ border-radius: 0;+ font-size: 12px;+ font-weight: 600;+ letter-spacing: var(--nordic-track);+ text-transform: uppercase;+ box-shadow: none;+}++.btn-sm {+ --bs-btn-font-size: 11px;+ --bs-btn-padding-x: .8rem;+ --bs-btn-padding-y: .45rem;+ font-size: 11px;+}++.btn-primary,+.btn-info,+.btn-success,+.btn-secondary,+.btn-dark,+[dark-theme="true"] .btn-info,+[dark-theme="true"] .btn-secondary,+[dark-theme="true"] #ModalAddToCart .btn-dark {+ --bs-btn-color: var(--nordic-bg);+ --bs-btn-bg: var(--nordic-ink);+ --bs-btn-border-color: var(--nordic-ink);+ --bs-btn-hover-color: var(--nordic-bg);+ --bs-btn-hover-bg: color-mix(in srgb, var(--nordic-ink) 82%, var(--nordic-bg));+ --bs-btn-hover-border-color: color-mix(in srgb, var(--nordic-ink) 82%, var(--nordic-bg));+ --bs-btn-active-color: var(--nordic-bg);+ --bs-btn-active-bg: var(--nordic-ink);+ --bs-btn-active-border-color: var(--nordic-ink);+ --bs-btn-disabled-color: var(--nordic-bg);+ --bs-btn-disabled-bg: var(--nordic-muted);+ --bs-btn-disabled-border-color: var(--nordic-muted);+ color: var(--bs-btn-color);+ background-color: var(--bs-btn-bg);+ border-color: var(--bs-btn-border-color);+}++.btn-primary:hover,+.btn-info:hover,+.btn-success:hover,+.btn-secondary:hover,+.btn-dark:hover,+[dark-theme="true"] .btn-secondary:hover {+ color: var(--bs-btn-hover-color);+ background-color: var(--bs-btn-hover-bg);+ border-color: var(--bs-btn-hover-border-color);+}++.btn-light,+[dark-theme="true"] .btn-light {+ --bs-btn-color: var(--nordic-ink);+ --bs-btn-bg: var(--nordic-surface);+ --bs-btn-border-color: var(--nordic-surface);+ --bs-btn-hover-color: var(--nordic-ink);+ --bs-btn-hover-bg: var(--nordic-line);+ --bs-btn-hover-border-color: var(--nordic-line);+ color: var(--bs-btn-color);+ background-color: var(--bs-btn-bg);+ border-color: var(--bs-btn-border-color);+}++[dark-theme="true"] .btn-light:hover {+ background-color: var(--bs-btn-hover-bg);+ border-color: var(--bs-btn-hover-border-color);+}++.btn-outline-primary,+.btn-outline-secondary,+.btn-outline-info,+.btn-outline-dark,+.btn-outline-success,+[dark-theme="true"] .btn-outline-secondary,+[dark-theme="true"] .btn-outline-info,+[dark-theme="true"] #ModalAddToCart .btn-outline-secondary {+ --bs-btn-color: var(--nordic-ink);+ --bs-btn-bg: transparent;+ --bs-btn-border-color: var(--nordic-ink);+ --bs-btn-hover-color: var(--nordic-bg);+ --bs-btn-hover-bg: var(--nordic-ink);+ --bs-btn-hover-border-color: var(--nordic-ink);+ --bs-btn-active-color: var(--nordic-bg);+ --bs-btn-active-bg: var(--nordic-ink);+ --bs-btn-active-border-color: var(--nordic-ink);+ color: var(--bs-btn-color);+ background-color: var(--bs-btn-bg);+ border: 1px solid var(--bs-btn-border-color);+}++.btn-outline-primary:hover,+.btn-outline-secondary:hover,+.btn-outline-info:hover,+.btn-outline-dark:hover,+.btn-outline-success:hover {+ color: var(--bs-btn-hover-color);+ background-color: var(--bs-btn-hover-bg);+}++.btn-link {+ --bs-btn-color: var(--nordic-ink);+ --bs-btn-hover-color: var(--nordic-muted-text);+ text-underline-offset: .25em;+}++/* a white rectangular button on imagery (slider, banners) */+.nordic-btn-light {+ display: inline-block;+ padding: .75rem 1.5rem;+ background: #fff;+ color: #23201c;+ border: 0;+ font-size: 12px;+ font-weight: 600;+ letter-spacing: var(--nordic-track);+ text-transform: uppercase;+ text-decoration: none;+}++.nordic-btn-light:hover,+.nordic-btn-light:focus-visible {+ background: #23201c;+ color: #fff;+}++/* ---------- forms ---------- */++.form-control,+.form-select,+.input-group-text,+.custom-select {+ border-radius: 0;+ border: 1px solid var(--nordic-line);+ background-color: var(--nordic-bg);+ color: var(--nordic-ink);+}++.form-control::placeholder {+ color: var(--nordic-muted-text);+ opacity: 1;+}++.form-control:focus,+.form-select:focus {+ border-color: var(--nordic-ink);+ background-color: var(--nordic-bg);+ color: var(--nordic-ink);+ box-shadow: 0 0 0 .2rem color-mix(in srgb, var(--nordic-ink) 25%, transparent);+}++.form-check-input {+ border-radius: 0;+ border-color: var(--nordic-muted);+ background-color: var(--nordic-bg);+}++.form-check-input[type=radio] {+ border-radius: 50%;+}++.form-switch .form-check-input {+ border-radius: 2em;+}++.form-check-input:checked {+ background-color: var(--nordic-ink);+ border-color: var(--nordic-ink);+}++/* the checked marks are white in Bootstrap; on the light ink of dark mode they need the dark bg */+[data-bs-theme=dark] .form-check-input:checked[type=checkbox] {+ --bs-form-check-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 20 20'%3e%3cpath fill='none' stroke='%231d1b18' stroke-linecap='round' stroke-linejoin='round' stroke-width='3' d='m6 10 3 3 6-6'/%3e%3c/svg%3e");+}++[data-bs-theme=dark] .form-check-input:checked[type=radio] {+ --bs-form-check-bg-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='2' fill='%231d1b18'/%3e%3c/svg%3e");+}++[data-bs-theme=dark] .form-switch .form-check-input:checked {+ --bs-form-switch-bg: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%231d1b18'/%3e%3c/svg%3e");+}++.col-form-label,+.form-label {+ font-weight: 500;+}++/* ---------- cards, badges, lists, tables ---------- */++.card,+[dark-theme="true"] .card {+ --bs-card-border-radius: 0;+ --bs-card-inner-border-radius: 0;+ --bs-card-bg: var(--nordic-bg);+ --bs-card-border-color: var(--nordic-line);+ --bs-card-cap-bg: var(--nordic-surface);+ border-radius: 0;+ background-color: var(--nordic-bg);+ border-color: var(--nordic-line);+ color: var(--nordic-ink);+}++.badge {+ border-radius: 0;+ font-size: 10px;+ font-weight: 600;+ letter-spacing: var(--nordic-track);+ text-transform: uppercase;+ padding: .4em .7em;+}++.list-group-item,+[dark-theme="true"] .list-group-item {+ background-color: transparent;+ color: var(--nordic-ink);+ border-color: var(--nordic-line);+}++.table,+[dark-theme="true"] .table {+ --bs-table-color: var(--nordic-ink);+ --bs-table-bg: transparent;+ --bs-table-border-color: var(--nordic-line);+ --bs-table-striped-bg: color-mix(in srgb, var(--nordic-surface) 60%, transparent);+ --bs-table-striped-color: var(--nordic-ink);+ --bs-table-hover-bg: var(--nordic-surface);+ --bs-table-hover-color: var(--nordic-ink);+ --bs-table-active-bg: var(--nordic-surface);+ --bs-table-active-color: var(--nordic-ink);+ color: var(--nordic-ink);+}++.table > thead th,+.table > thead td {+ font-size: 11px;+ font-weight: 600;+ letter-spacing: var(--nordic-track);+ text-transform: uppercase;+ color: var(--nordic-muted-text);+ border-bottom: 1px solid var(--nordic-ink);+}++.table > :not(caption) > * > * {+ border-bottom-color: var(--nordic-line);+}++.table-hover tbody tr:hover,+[dark-theme="true"] .table-hover tbody tr:hover {+ color: var(--nordic-ink);+}++.alert {+ border-radius: 0;+}++.breadcrumb {+ font-size: 11px;+ letter-spacing: var(--nordic-track);+ text-transform: uppercase;+}++.breadcrumb a {+ color: var(--nordic-muted-text);+ text-decoration: none;+}++.breadcrumb-item.active,+[dark-theme="true"] .breadcrumb-item.active {+ color: var(--nordic-ink);+}++/* ---------- overlays: modals, sidebars, dropdowns ---------- */++.modal-content,+[dark-theme="true"] .modal-content,+[dark-theme="true"] #search-box .modal-content,+.b-sidebar,+[dark-theme="true"] .b-sidebar,+.dropdown-menu,+.popover,+.offcanvas {+ --bs-modal-border-radius: 0;+ --bs-modal-inner-border-radius: 0;+ --bs-modal-bg: var(--nordic-bg);+ --bs-dropdown-bg: var(--nordic-bg);+ --bs-dropdown-border-radius: 0;+ --bs-dropdown-border-color: var(--nordic-line);+ --bs-dropdown-link-color: var(--nordic-ink);+ --bs-dropdown-link-hover-bg: var(--nordic-surface);+ border-radius: 0;+ background-color: var(--nordic-bg);+ color: var(--nordic-ink);+}++.b-sidebar-header,+[dark-theme="true"] .b-sidebar-header {+ border-bottom: 1px solid var(--nordic-line);+ font-family: var(--nordic-serif);+}++.b-sidebar-footer,+[dark-theme="true"] .b-sidebar-footer {+ border-top: 1px solid var(--nordic-line);+}++[data-bs-theme=dark] .b-sidebar .btn-close,+[data-bs-theme=dark] .modal .btn-close {+ filter: invert(1) grayscale(1) brightness(2);+}++[dark-theme="true"] .modal-close.btn-secondary {+ background-color: transparent;+ border-color: transparent;+}++.border-bottom,+.border-top,+.border,+[dark-theme="true"] .border-bottom,+[dark-theme="true"] .border-top {+ border-color: var(--nordic-line) !important;+}++/* ---------- pagination ---------- */++.pagination {+ --bs-pagination-border-radius: 0;+ --bs-pagination-color: var(--nordic-ink);+ --bs-pagination-bg: transparent;+ --bs-pagination-border-color: var(--nordic-line);+ --bs-pagination-hover-color: var(--nordic-ink);+ --bs-pagination-hover-bg: var(--nordic-surface);+ --bs-pagination-hover-border-color: var(--nordic-line);+ --bs-pagination-focus-color: var(--nordic-ink);+ --bs-pagination-focus-bg: var(--nordic-surface);+ --bs-pagination-active-color: var(--nordic-bg);+ --bs-pagination-active-bg: var(--nordic-ink);+ --bs-pagination-active-border-color: var(--nordic-ink);+ --bs-pagination-disabled-color: var(--nordic-muted-text);+ --bs-pagination-disabled-bg: transparent;+ --bs-pagination-disabled-border-color: var(--nordic-line);+}++/* ---------- required marks and validation: the sale colour meets AA on both schemes ---------- */++span.required,+.field-validation-error,+.message-error ul {+ color: var(--nordic-sale);+}++/* ---------- back-to-top button ---------- */++.up-btn {+ background: var(--nordic-ink);+ border-radius: 0;+}++.up-btn:not(.up-btn__hide) div::before,+.up-btn:not(.up-btn__hide) div::after {+ background: var(--nordic-bg);+}++/* ---------- layout rhythm ---------- */++.nordic-hairline {+ border: 0;+ border-top: 1px solid var(--nordic-line);+ margin: 0;+}++/* ---------- alerts in the palette (Bootstrap info is a bright cyan) ---------- */++.alert-info,+[dark-theme="true"] .alert-info {+ --bs-alert-bg: var(--nordic-surface);+ --bs-alert-color: var(--nordic-ink);+ --bs-alert-border-color: var(--nordic-line);+ --bs-alert-link-color: var(--nordic-ink);+ background-color: var(--nordic-surface);+ border-color: var(--nordic-line);+ color: var(--nordic-ink);+}diff --git a/src/Plugins/Theme.Nordic/Content/css/catalog.css b/src/Plugins/Theme.Nordic/Content/css/catalog.cssnew file mode 100644index 000000000..84d152b92--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/catalog.css@@ -0,0 +1,812 @@+/*+ Nordic Editorial - product card (grid and list) and, from Task 7, the listings.+ Markup: Views/Nordic/Shared/Partials/CatalogProductView.cshtml, CatalogProductListView.cshtml+ and their client twins under Views/Nordic/Catalog/Partials/Client.++ Every rule is scoped to .nordic-card, so a Default card rendered by a view the theme+ does not override keeps Default's look. [dark-theme="true"] twins answer the Default+ dark rules that would otherwise out-rank them.+*/++/* ---------- card shell ---------- */++.product-box.nordic-card,+[dark-theme="true"] .product-box.nordic-card {+ background: transparent;+ border: 0;+ color: var(--nordic-ink);+}++.product-box.nordic-card::before,+.product-box.nordic-card:hover::before,+[dark-theme="true"] .product-box.nordic-card::before,+[dark-theme="true"] .product-box.nordic-card:hover::before {+ display: none;+}++.product-box.nordic-card:not(.mobile):hover,+[dark-theme="true"] .product-box.nordic-card:not(.mobile):hover {+ background: transparent;+}++/* ---------- image: 4:5, full-bleed ---------- */++.product-box.nordic-card .picture-container .img-container::before {+ padding-top: 125%;+}++.product-box.nordic-card .picture-container .img-container img,+[dark-theme="true"] .product-box.nordic-card .picture-container .img-container img {+ width: 100%;+ height: 100%;+ max-width: none;+ object-fit: cover;+ background-color: var(--nordic-surface);+}++[dark-theme="true"] .product-box.nordic-card .picture-container .img-container {+ border: 0;+}++.product-box.nordic-card .main-product-img {+ transition: transform .6s ease;+}++.product-box.nordic-card:not(.mobile):hover .main-product-img {+ transform: scale(1.02);+}++/* ---------- badges ---------- */++.nordic-card__badges {+ position: absolute;+ top: 10px;+ left: 10px;+ z-index: 3;+ display: flex;+ flex-wrap: wrap;+ gap: 6px;+ pointer-events: none;+}++.nordic-badge {+ display: inline-block;+ padding: 4px 8px;+ background: var(--nordic-bg);+ color: var(--nordic-ink);+ font-size: 10px;+ font-weight: 600;+ letter-spacing: .12em;+ line-height: 1.2;+ text-transform: uppercase;+}++.nordic-badge--sale {+ color: var(--nordic-sale);+}++.nordic-badge--auction {+ background: var(--nordic-ink);+ color: var(--nordic-bg);+}++.product-box.nordic-card .nordic-card__badges .product-label {+ position: static;+}++.product-box.nordic-card .product-label .badge {+ padding: 4px 8px;+ background: var(--nordic-bg) !important;+ color: var(--nordic-ink) !important;+}++/* ---------- quick view: a bar across the foot of the image ---------- */++.product-box.nordic-card .quick-view-button,+[dark-theme="true"] .product-box.nordic-card .quick-view-button {+ z-index: 3;+ padding: 10px;+ background: color-mix(in srgb, var(--nordic-bg) 92%, transparent);+ border: 0;+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: .12em;+}++.product-box.nordic-card .quick-view-button .b-icon {+ font-size: 12px;+ margin-right: 4px;+}++.product-box.nordic-card:hover .quick-view-button,+.product-box.nordic-card:focus-within .quick-view-button {+ transform: translateY(0);+}++.product-box.nordic-card .quick-view-button:hover {+ background: var(--nordic-ink);+ color: var(--nordic-bg);+}++/* ---------- text ---------- */++.product-box.nordic-card .card-body {+ padding: 14px 0 0;+ background: transparent;+}++.nordic-card__brand {+ margin-bottom: 3px;+ color: var(--nordic-muted-text);+ font-size: 10.5px;+ font-weight: 500;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.product-box.nordic-card .card-title {+ margin: 0;+ line-height: 1.3;+}++.product-box.nordic-card .card-title a,+[dark-theme="true"] .product-box.nordic-card .card-title a {+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: 16px;+ font-weight: 400;+ letter-spacing: 0;+ text-decoration: none;+}++.product-box.nordic-card .card-title a:hover {+ text-decoration: underline;+ text-underline-offset: .2em;+}++.product-box.nordic-card .sku {+ color: var(--nordic-muted-text);+ font-size: 11px;+}++.product-box.nordic-card .prices-rating {+ margin-top: 6px;+}++.product-box.nordic-card .prices {+ align-items: baseline;+ gap: 0 8px;+}++.product-box.nordic-card .actual-price,+[dark-theme="true"] .product-box.nordic-card .actual-price {+ color: var(--nordic-ink);+ font-size: 14px;+ font-weight: 500;+}++.product-box.nordic-card .prices.is-sale .actual-price,+[dark-theme="true"] .product-box.nordic-card .prices.is-sale .actual-price {+ color: var(--nordic-sale);+}++.product-box.nordic-card .old-price {+ margin: 0;+ color: var(--nordic-muted-text);+ font-size: 13px;+}++.product-box.nordic-card .nordic-card__countdown {+ margin-top: 4px;+ color: var(--nordic-muted-text);+ font-size: 11.5px;+}++.product-box.nordic-card .nordic-card__countdown .col-form-label {+ padding: 0;+ font-weight: 500;+ color: var(--nordic-muted-text);+}++.product-box.nordic-card .rating {+ margin-top: 4px;+ font-size: 12px;+}++.product-box.nordic-card .rating .b-rating + a,+[dark-theme="true"] .product-box.nordic-card .rating .b-rating + a {+ color: var(--nordic-muted-text);+ font-size: 12px;+ font-weight: 400;+}++/* ---------- footer: colour dots and actions, always visible ---------- */++.product-box.nordic-card .card-footer,+.product-box.nordic-card:hover .card-footer,+.product-box.nordic-card.mobile:hover .card-footer,+[dark-theme="true"] .product-box.nordic-card .card-footer {+ position: static;+ padding: 8px 0 0;+ background: transparent;+ border: 0;+ opacity: 1;+ visibility: visible;+ transform: none;+}++.product-box.nordic-card .card-footer::before,+[dark-theme="true"] .product-box.nordic-card .card-footer::before {+ display: none;+}++/* the grid card keeps to image, name, price and colours; the rest is in the list row */+.product-box.nordic-card:not(.nordic-card--list) .spec-container,+.product-box.nordic-card:not(.nordic-card--list) .desc,+.product-box.nordic-card:not(.nordic-card--list) .attr-container .attr:not(.attr--color) {+ display: none;+}++.product-box.nordic-card .attr-container table {+ width: auto;+}++.product-box.nordic-card .attr--color .attr-name {+ position: absolute;+ width: 1px;+ height: 1px;+ overflow: hidden;+ clip: rect(0 0 0 0);+}++.product-box.nordic-card .attr--color .attr-value {+ display: flex;+ flex-wrap: wrap;+ gap: 6px;+ margin: 0;+}++.product-box.nordic-card .attr-value .btn.color-container,+[dark-theme="true"] .product-box.nordic-card .attr-value .btn.color-container {+ width: 16px;+ height: 16px;+ margin: 0;+ padding: 0;+ background: transparent;+ border: 1px solid var(--nordic-line);+ border-radius: 50%;+}++.product-box.nordic-card .attr-value .btn.color-container:hover,+.product-box.nordic-card .attr-value .btn.color-container:focus-visible {+ outline: 1px solid var(--nordic-ink);+ outline-offset: 2px;+}++.product-box.nordic-card .color-container .color {+ display: block;+ width: 100%;+ height: 100%;+ border-radius: 50%;+ font-size: 0;+}++.product-box.nordic-card .attr-value .btn.name:not(.color-container) {+ padding: 2px 8px;+ background: transparent;+ border: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+ font-size: 11px;+ letter-spacing: .06em;+}++.product-box.nordic-card .catalog-quantity {+ max-width: 64px;+ margin-top: 8px;+}++.product-box.nordic-card .nordic-card__actions {+ display: flex;+ gap: 6px;+ width: 100%;+ margin: 10px 0 0;+}++.product-box.nordic-card .nordic-card__actions .btn {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ gap: 6px;+ padding: 7px 10px;+ border-radius: 0 !important;+ background: transparent;+ border: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+ font-size: 10.5px;+}++.product-box.nordic-card .nordic-card__actions .btn:hover,+.product-box.nordic-card .nordic-card__actions .btn:focus-visible {+ background: var(--nordic-ink);+ border-color: var(--nordic-ink);+ color: var(--nordic-bg);+}++.product-box.nordic-card .nordic-card__cart {+ flex: 1 1 auto;+}++.product-box.nordic-card .nordic-card__cart .add-cart-text {+ font-size: 10.5px;+ font-weight: 600;+ white-space: nowrap;+ overflow: hidden;+ text-overflow: ellipsis;+}++.product-box.nordic-card .nordic-card__icon {+ flex: 0 0 34px;+ width: 34px;+}++.product-box.nordic-card .nordic-card__actions .b-icon.bi {+ font-size: 13px;+}++/* ---------- list row ---------- */++.nordic-list-row.border-bottom {+ border-color: var(--nordic-line) !important;+}++.product-box.nordic-card.nordic-card--list {+ display: grid;+ grid-template-columns: 160px minmax(0, 1fr);+ grid-template-rows: auto 1fr;+ column-gap: 24px;+}++.product-box.nordic-card--list .picture-container {+ grid-row: 1 / span 2;+}++.product-box.nordic-card--list .card-body {+ padding: 0;+}++.product-box.nordic-card--list .card-footer {+ padding-top: 6px;+}++.product-box.nordic-card--list .desc,+[dark-theme="true"] .product-box.nordic-card--list .desc {+ max-height: 4.8em;+ margin-top: 6px;+ color: var(--nordic-muted-text);+ font-size: 13.5px;+ line-height: 1.6;+}++.product-box.nordic-card--list .spec-container {+ margin-top: 8px;+ font-size: 12.5px;+}++.product-box.nordic-card--list .spec-name,+[dark-theme="true"] .product-box.nordic-card--list .spec-name {+ color: var(--nordic-ink);+ font-size: 12.5px;+}++.product-box.nordic-card--list .spec-value,+[dark-theme="true"] .product-box.nordic-card--list .spec-value {+ color: var(--nordic-muted-text);+ font-size: 12.5px;+}++.product-box.nordic-card--list .nordic-card__actions {+ width: auto;+ max-width: 360px;+}++@media (max-width: 575.98px) {+ .product-box.nordic-card.nordic-card--list {+ grid-template-columns: 110px minmax(0, 1fr);+ column-gap: 14px;+ }++ .product-box.nordic-card .card-title a {+ font-size: 15px;+ }++ /* two cards a row on phones: icons only in the action row */+ .product-box.nordic-card:not(.nordic-card--list) .nordic-card__cart .add-cart-text {+ display: none;+ }++ .product-box.nordic-card .nordic-card__countdown {+ padding: 0;+ font-size: 11px;+ }+}++/* =====================================================================+ Listings: category, brand and collection (Views/Nordic/Catalog/*Layout.GridOrLines)+ and the shared left column (filters, category and collection navigation).+ ===================================================================== */++/* ---------- heading panel ---------- */++.nordic-listing-head {+ display: grid;+ grid-template-columns: minmax(0, 1fr);+ margin-bottom: 24px;+ background: var(--nordic-surface);+}++.nordic-listing-head.has-picture {+ grid-template-columns: minmax(0, 1.15fr) minmax(0, 1fr);+}++.nordic-listing-head__text {+ display: flex;+ flex-direction: column;+ justify-content: center;+ padding: 32px 36px;+}++.nordic-listing-head .generalTitle {+ margin: 0 0 10px;+ font-size: clamp(1.9rem, 1.5rem + 1.3vw, 2.6rem);+ font-weight: 300;+ text-align: left;+}++.nordic-listing-head__desc {+ color: var(--nordic-muted-text);+ font-size: 15px;+ line-height: 1.65;+}++.nordic-listing-head__desc p:last-child {+ margin-bottom: 0;+}++.nordic-listing-head__media {+ aspect-ratio: 4 / 3;+ overflow: hidden;+}++.nordic-listing-head__media img {+ display: block;+ width: 100%;+ height: 100%;+ object-fit: cover;+}++@media (max-width: 767.98px) {+ .nordic-listing-head.has-picture {+ grid-template-columns: minmax(0, 1fr);+ }++ .nordic-listing-head__media {+ order: -1;+ aspect-ratio: 16 / 9;+ }++ .nordic-listing-head__text {+ padding: 22px 20px;+ }+}++/* ---------- subcategory chips ---------- */++.nordic-chips ul {+ display: flex;+ flex-wrap: wrap;+ gap: 8px;+ margin: 0 0 24px;+ padding: 0;+ list-style: none;+}++.nordic-chip {+ display: inline-block;+ padding: 7px 14px;+ border: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .1em;+ text-decoration: none;+ text-transform: uppercase;+}++.nordic-chip:hover,+.nordic-chip:focus-visible,+.nordic-chip.is-active {+ background: var(--nordic-ink);+ border-color: var(--nordic-ink);+ color: var(--nordic-bg);+}++/* ---------- results bar ---------- */++.nordic-listing .catalog-selectors {+ align-items: center;+ margin-bottom: 20px !important;+ padding: 10px 0;+ border-top: 1px solid var(--nordic-line);+ border-bottom: 1px solid var(--nordic-line);+ color: var(--nordic-muted-text);+ font-size: 12px;+}++.nordic-listing .catalog-selectors .col-form-label {+ color: var(--nordic-muted-text);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .1em;+ text-transform: uppercase;+}++.nordic-listing .catalog-selectors .form-select {+ width: auto;+ padding-top: .35rem;+ padding-bottom: .35rem;+ font-size: 13px;+}++.nordic-listing .catalog-selectors .viewmode-icon,+.nordic-listing .catalog-selectors .viewmode-icon .text-info {+ color: var(--nordic-muted-text) !important;+}++.nordic-listing .catalog-selectors .viewmode-icon .selected,+.nordic-listing .catalog-selectors .viewmode-icon .selected.text-info {+ color: var(--nordic-ink) !important;+}++.nordic-listing .catalog-selectors .items-total {+ color: var(--nordic-ink);+ font-weight: 600;+}++/* the featured strip above the results */+.nordic-listing .featured-product-grid > h2 {+ padding-bottom: 8px;+ border-bottom: 1px solid var(--nordic-line);+ font-family: var(--nordic-serif);+ font-size: 1.35rem;+ font-weight: 400;+}++.nordic-listing .page-separator {+ display: none;+}++/* bottom description */+.nordic-listing > .card:not(.product-box) {+ margin-top: 32px;+ background: transparent;+ border: 0;+ border-top: 1px solid var(--nordic-line);+ color: var(--nordic-muted-text);+}++/* ---------- left column: filters and navigation ---------- */++#TwoColumns .generalLeftSide h2.h5,+#TwoColumns .generalLeftSide .generalTitle,+#TwoColumns .generalLeftSide .block > .title,+#TwoColumns .generalLeftSide .card-header,+#TwoColumns .generalLeftSide .block h2 {+ margin: 0 0 12px;+ padding: 0 0 8px;+ background: transparent;+ border: 0;+ border-bottom: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+ font-family: var(--nordic-sans);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: .12em;+ text-transform: uppercase;+}++#TwoColumns .generalLeftSide h2.h5 strong {+ font-weight: 600;+}++#TwoColumns .generalLeftSide .card,+[dark-theme="true"] #TwoColumns .generalLeftSide .card {+ background: transparent;+ border: 0;+}++#TwoColumns .generalLeftSide .card-body {+ padding: 0;+}++#TwoColumns .generalLeftSide .product-spec-group {+ justify-content: flex-start;+ margin: 0 0 16px;+}++#TwoColumns .generalLeftSide .product-spec-group .title h6 {+ margin: 0 0 8px;+ color: var(--nordic-muted-text);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .1em;+ text-transform: uppercase;+}++/* options as square checkboxes */+#TwoColumns .generalLeftSide .product-spec-group .btn-group-sm {+ flex-direction: column;+ align-items: flex-start;+}++#TwoColumns .generalLeftSide .product-spec-group .btn.btn-light:not(.color-container),+[dark-theme="true"] #TwoColumns .generalLeftSide .product-spec-group .btn.btn-light:not(.color-container) {+ display: inline-flex;+ align-items: center;+ gap: 10px;+ padding: 3px 0;+ background: transparent;+ border: 0;+ color: var(--nordic-ink);+ font-size: 13.5px;+ font-weight: 400;+ letter-spacing: normal;+ text-align: left;+ text-transform: none;+}++#TwoColumns .generalLeftSide .product-spec-group .btn.btn-light:not(.color-container)::before {+ content: "";+ flex: none;+ width: 14px;+ height: 14px;+ border: 1px solid var(--nordic-muted);+ background: var(--nordic-bg);+}++#TwoColumns .generalLeftSide .product-spec-group .btn.btn-light:not(.color-container):hover::before,+#TwoColumns .generalLeftSide .product-spec-group .btn.btn-light:not(.color-container):focus-visible::before {+ border-color: var(--nordic-ink);+}++/* colour families as swatches */+#TwoColumns .generalLeftSide .product-spec-group .btn-group-sm:has(.color-container) {+ flex-direction: row;+ flex-wrap: wrap;+ gap: 8px;+}++#TwoColumns .generalLeftSide .btn.color-container,+[dark-theme="true"] #TwoColumns .generalLeftSide .btn.color-container {+ width: 24px;+ height: 24px;+ margin: 0 !important;+ padding: 0;+ background: transparent;+ border: 1px solid var(--nordic-line);+ border-radius: 50%;+}++#TwoColumns .generalLeftSide .btn.color-container:hover,+#TwoColumns .generalLeftSide .btn.color-container:focus-visible {+ outline: 1px solid var(--nordic-ink);+ outline-offset: 2px;+}++#TwoColumns .generalLeftSide .btn.color-container .color {+ display: block;+ width: 100%;+ height: 100%;+ border-radius: 50%;+ font-size: 0;+}++/* active filters: removable tags */+#TwoColumns .generalLeftSide .filtered-items,+[dark-theme="true"] #TwoColumns .generalLeftSide .filtered-items {+ padding: 14px;+ background: var(--nordic-surface);+}++#TwoColumns .generalLeftSide .filtered-items a {+ display: inline-flex;+ padding: 4px 8px !important;+ border: 1px solid var(--nordic-line);+ background: var(--nordic-bg);+ color: var(--nordic-ink);+ font-size: 12px;+ cursor: pointer;+}++#TwoColumns .generalLeftSide .filtered-items .text-danger {+ color: var(--nordic-muted-text) !important;+}++#TwoColumns .generalLeftSide .filtered-items .btn-danger {+ background: transparent;+ border: 1px solid var(--nordic-ink);+ color: var(--nordic-ink);+}++#TwoColumns .generalLeftSide .filtered-items .btn-danger:hover {+ background: var(--nordic-ink);+ color: var(--nordic-bg);+}++/* category / collection navigation */+#TwoColumns .generalLeftSide .block ul {+ justify-content: flex-start;+}++#TwoColumns .generalLeftSide li a,+[dark-theme="true"] #TwoColumns .generalLeftSide li a {+ padding-bottom: 8px;+ color: var(--nordic-ink);+ font-size: 14px;+ font-weight: 400;+}++#TwoColumns .generalLeftSide li a:hover {+ text-decoration: underline;+ text-underline-offset: .2em;+}++#TwoColumns .generalLeftSide li.active.last > a,+#TwoColumns .generalLeftSide .block-category-navigation li.active .sublist > li.last > a,+[dark-theme="true"] #TwoColumns .generalLeftSide li.active.last > a,+[dark-theme="true"] #TwoColumns .generalLeftSide .block-category-navigation li.active .sublist > li.last > a {+ color: var(--nordic-ink);+ font-weight: 600;+ text-decoration: underline;+ text-underline-offset: .25em;+}++#TwoColumns .generalLeftSide .block-category-navigation li.active > .sublist > li::before,+#TwoColumns .generalLeftSide .block-category-navigation li.active > .sublist > li::after {+ border-left-color: var(--nordic-line);+}++/* ---------- pager: hairlines, current page underlined ---------- */++.pagination {+ gap: 4px;+}++.pagination .page-link,+[dark-theme="true"] .pagination .page-link {+ min-width: 36px;+ padding: 6px 10px;+ background: transparent;+ border: 0;+ border-bottom: 1px solid var(--nordic-line);+ border-radius: 0 !important;+ color: var(--nordic-ink);+ font-size: 13px;+ font-weight: 500;+ text-align: center;+}++.pagination .currentpage.page-item .page-link,+.pagination .page-item.active .page-link {+ background: transparent;+ border-color: transparent;+ border-bottom: 2px solid var(--nordic-ink);+ color: var(--nordic-ink);+}++.pagination .page-item:not(.currentpage):hover .page-link {+ background: transparent;+ border-color: transparent;+ border-bottom-color: var(--nordic-muted);+ color: var(--nordic-ink);+}diff --git a/src/Plugins/Theme.Nordic/Content/css/content.css b/src/Plugins/Theme.Nordic/Content/css/content.cssnew file mode 100644index 000000000..8f108daa0--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/content.css@@ -0,0 +1,230 @@+/*+ Nordic Editorial - blog, news, knowledgebase, pages and search. CSS only: these views are+ Default markup (Grand.Web/Views/Blog, News, Knowledgebase, Page, Catalog/Search).+*/++/* ---------- blog and news lists ---------- */++.blog-page .card,+.news-list-page .card,+[dark-theme="true"] .blog-page .card,+[dark-theme="true"] .news-list-page .card {+ margin-bottom: 36px;+ background: transparent;+ border: 0;+}++.blog-page .card-img-top,+.news-list-page .card-img-top {+ width: 100%;+ aspect-ratio: 16 / 9;+ object-fit: cover;+ border-radius: 0;+ background: var(--nordic-surface);+}++.blog-page .card-header,+.news-list-page .card-header,+.blogpost-page .card-header,+.news-item-page .card-header {+ padding: 14px 0 6px;+ background: transparent;+ border: 0;+}++.blog-page .card-header .h5,+.blog-page .card-header h2,+.blog-page .card-header h3,+.news-list-page .card-header .h5,+.news-list-page .card-header h2,+.news-list-page .card-header h3 {+ font-family: var(--nordic-serif);+ font-size: clamp(20px, 18px + .5vw, 24px);+ font-weight: 400;+ line-height: 1.25;+}++.blog-page .card-header a,+.news-list-page .card-header a {+ color: var(--nordic-ink);+ text-decoration: none;+}++.blog-page .card-header a:hover,+.news-list-page .card-header a:hover {+ text-decoration: underline;+ text-underline-offset: .2em;+}++.blog-page .card-body,+.news-list-page .card-body {+ padding: 0 0 10px;+ color: var(--nordic-muted-text);+ font-size: 14.5px;+ line-height: 1.65;+}++.blog-page .card-footer,+.news-list-page .card-footer {+ padding: 10px 0 0;+ background: transparent;+ border: 0;+ border-top: 1px solid var(--nordic-line);+ color: var(--nordic-muted-text);+ font-size: 11px;+ letter-spacing: .1em;+ text-transform: uppercase;+}++.news-list-page .buttons {+ padding: 0 !important;+}++.blog-page .tags a,+.blogpost-page .tags a {+ display: inline-block;+ margin: 0 6px 6px 0;+ padding: 3px 9px;+ border: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+ font-size: 11px;+ letter-spacing: .08em;+ text-decoration: none;+ text-transform: uppercase;+}++/* ---------- a single post or news item: a readable column ---------- */++.blogpost-page,+.news-item-page {+ max-width: 760px;+ margin: 0 auto;+}++.blogpost-page .generalTitle,+.news-item-page .generalTitle {+ margin-bottom: 10px;+ font-size: clamp(2rem, 1.5rem + 1.6vw, 2.9rem);+ font-weight: 300;+ line-height: 1.1;+ text-align: left;+}++.blogpost-page .text-muted,+.news-item-page .text-muted,+.news-item-page .date {+ font-size: 11px;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.blogpost-page .img-fluid,+.news-item-page .img-fluid {+ width: 100%;+ aspect-ratio: 16 / 9;+ margin: 18px 0 24px !important;+ object-fit: cover;+}++.blogpost-page .post-body,+.blogpost-page .blog-post-body,+.blogpost-page [v-pre],+.news-item-page .news-body,+.news-item-page [v-pre] {+ color: var(--nordic-ink);+ font-size: 17px;+ line-height: 1.7;+}++.blogpost-page [v-pre] h2,+.blogpost-page [v-pre] h3,+.news-item-page [v-pre] h2,+.news-item-page [v-pre] h3 {+ margin: 1.6em 0 .5em;+}++.blogpost-page .new-comment,+.news-item-page .new-comment {+ margin-top: 40px;+ padding-top: 24px !important;+ border-top: 1px solid var(--nordic-line);+}++.blogpost-page .card,+.news-item-page .card,+[dark-theme="true"] .blogpost-page .card,+[dark-theme="true"] .news-item-page .card {+ background: transparent;+ border: 0;+ border-bottom: 1px solid var(--nordic-line);+}++.blogpost-page .card-body,+.news-item-page .card-body {+ padding: 0 0 14px;+}++/* ---------- knowledgebase ---------- */++.page .list-group:has(> .list-group-item > a[href*="knowledgebase"]),+.page .knowledgebase-categories,+.page .knowledgebase-articles {+ border-top: 1px solid var(--nordic-line);+}++.page .list-group-item a[href*="knowledgebase"],+.page .list-group-item a[href*="/kb"] {+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: 17px;+ text-decoration: none;+}++.page .list-group-item a[href*="knowledgebase"]:hover {+ text-decoration: underline;+ text-underline-offset: .2em;+}++/* the article body itself */+.page .article-body,+.page .knowledgebase-article {+ max-width: 760px;+ font-size: 16.5px;+ line-height: 1.7;+}++/* ---------- landing pages (Page) and page blocks ---------- */++/* scoped to .page: the header promo bar and the home intro are page blocks too */+.page .page-block-body,+.page .page-body {+ font-size: 16px;+ line-height: 1.7;+}++.blogpost-page .new-comment .generalTitle,+.news-item-page .new-comment .generalTitle {+ font-size: clamp(1.4rem, 1.2rem + .6vw, 1.75rem);+ font-weight: 400;+}++/* ---------- search ---------- */++.search-page .search-input .form-control,+.search-page .basic-search .form-control {+ border: 0;+ border-bottom: 1px solid var(--nordic-ink);+ background: transparent;+ font-size: 17px;+}++.search-page .advanced-search,+[dark-theme="true"] .advanced-search-results {+ background: var(--nordic-surface);+ border: 0;+}++.not-found-page .generalTitle {+ font-size: clamp(2rem, 1.5rem + 1.6vw, 2.9rem);+ font-weight: 300;+}diff --git a/src/Plugins/Theme.Nordic/Content/css/fonts.css b/src/Plugins/Theme.Nordic/Content/css/fonts.cssnew file mode 100644index 000000000..aaf0b3fe4--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/fonts.css@@ -0,0 +1,19 @@+/* Nordic Editorial - self-hosted fonts (SIL OFL 1.1, see ../fonts/README.md). Latin subset only. */++@font-face {+ font-family: "Fraunces";+ font-style: normal;+ font-weight: 300 600;+ font-display: swap;+ src: url("../fonts/fraunces-latin-var.woff2") format("woff2");+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}++@font-face {+ font-family: "Inter";+ font-style: normal;+ font-weight: 400 700;+ font-display: swap;+ src: url("../fonts/inter-latin-var.woff2") format("woff2");+ unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD;+}diff --git a/src/Plugins/Theme.Nordic/Content/css/header.css b/src/Plugins/Theme.Nordic/Content/css/header.cssnew file mode 100644index 000000000..de7686ef0--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/header.css@@ -0,0 +1,685 @@+/*+ Nordic Editorial - top bar, header, menu row, newsletter and footer.+ Markup: Views/Nordic/Shared/Partials/Header.cshtml, Logo.cshtml, NewsletterBox.cshtml,+ Views/Nordic/Shared/Components/Footer/Default.cshtml.+*/++/* ---------- top bar (PageBlock HeaderPromoText) ---------- */++.nordic-topbar {+ padding: 7px 16px;+ border-bottom: 1px solid var(--nordic-line);+ background: var(--nordic-bg);+ color: var(--nordic-muted-text);+ font-size: 10.5px;+ font-weight: 500;+ letter-spacing: .14em;+ text-align: center;+ text-transform: uppercase;+}++.nordic-topbar .generalMarginSupporter,+.nordic-topbar .page-block-body {+ margin: 0;+ padding: 0 !important;+}++.nordic-topbar .generalTitle {+ display: none;+}++.nordic-topbar p {+ margin: 0;+}++.nordic-topbar a {+ color: inherit;+ text-underline-offset: .2em;+}++/* ---------- header ---------- */++.header-nav.nordic-header,+[dark-theme="true"] .header-nav.nordic-header {+ background-color: var(--nordic-bg);+ border-bottom: 1px solid var(--nordic-line);+ box-shadow: none;+}++.nordic-header .navbar {+ padding-top: 18px;+ padding-bottom: 10px;+}++.nordic-header .b-icon.bi,+.nordic-header .top-header-items .b-icon.bi {+ font-size: 19px;+ color: var(--nordic-ink);+}++.nordic-header .text-dark,+.nordic-header .text-white {+ color: var(--nordic-ink) !important;+}++.nordic-header .navbar-nav .nav-link,+[dark-theme="true"] .nordic-header.navbar-light .navbar-nav .nav-link {+ color: var(--nordic-ink);+}++.nordic-header .qty-indicator,+[dark-theme="true"] .nordic-header .qty-indicator {+ background: var(--nordic-ink);+ color: var(--nordic-bg);+ font-size: 10px;+ font-weight: 600;+}++.menu-toggler span,+[dark-theme="true"] .menu-toggler span {+ height: 1.5px;+ background: var(--nordic-ink);+}++/* the colour-scheme switch as a quiet square icon button instead of Bootstrap's pill:+ the checkbox stays (v-model, keyboard, screen readers) but is drawn invisibly over the+ icon; the icon shows the scheme a click switches to - a moon in light, a sun in dark */+.nordic-header .contrast-switch {+ position: relative;+ margin: 0;+ padding: 0;+ min-height: 0;+}++.nordic-header .contrast-switch .form-check-input {+ position: absolute;+ inset: 0;+ z-index: 1;+ width: 100%;+ height: 100%;+ margin: 0;+ opacity: 0;+ cursor: pointer;+}++.nordic-header .contrast-switch .form-check-label {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ width: 34px;+ height: 34px;+ border: 1px solid transparent;+ transition: border-color .15s ease, background-color .15s ease;+}++.nordic-header .contrast-switch:hover .form-check-label {+ border-color: var(--nordic-line);+ background: var(--nordic-surface);+}++.nordic-header .contrast-switch .form-check-input:focus-visible ~ .form-check-label {+ outline: 2px solid var(--nordic-ink);+ outline-offset: 2px;+}++.nordic-header .contrast-switch .b-icon.bi,+.nordic-header .contrast-switch .b-icon.bi.text-info,+.nordic-header .contrast-switch .b-icon.bi.text-dark {+ color: var(--nordic-ink) !important;+ font-size: 17px !important;+}++.nordic-header .contrast-switch .b-icon.light {+ display: none;+}++.nordic-header .contrast-switch .b-icon.dark {+ display: inline;+}++.nordic-header .contrast-switch .form-check-input:checked ~ .form-check-label .b-icon.light {+ display: inline;+}++.nordic-header .contrast-switch .form-check-input:checked ~ .form-check-label .b-icon.dark {+ display: none;+}++/* the wordmark (store name) */+.nordic-wordmark,+.nordic-wordmark:hover,+.nordic-wordmark:focus-visible {+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: 28px;+ font-weight: 400;+ letter-spacing: -.01em;+ line-height: 1.1;+ text-decoration: none;+ white-space: nowrap;+}++.nordic-header-link {+ display: inline-flex;+ align-items: center;+ gap: .5rem;+ padding: .25rem 0;+ background: none;+ border: 0;+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .1em;+ text-transform: uppercase;+}++.nordic-header-link .b-icon.bi {+ font-size: 15px;+}++.nordic-header-link:hover {+ color: var(--nordic-muted-text);+}++/* desktop: search | wordmark | icons, then the centred menu row */+@media (min-width: 992px) {+ .nordic-header #header-container {+ display: grid;+ grid-template-columns: 1fr auto 1fr;+ align-items: center;+ }++ .nordic-header .menu-container {+ display: none;+ }++ .nordic-header .nordic-header-left {+ display: flex;+ justify-self: start;+ }++ .nordic-header .store-logo {+ flex: none;+ margin: 0;+ padding: 0;+ justify-self: center;+ }++ .nordic-header .top-header-items {+ justify-self: end;+ gap: .25rem;+ }++ .nordic-header .nordic-search-item {+ display: none;+ }+}++@media (max-width: 991.98px) {+ .nordic-header .nordic-header-left,+ .nordic-header .nordic-menu-row {+ display: none;+ }++ .nordic-header .navbar {+ padding-top: 10px;+ padding-bottom: 10px;+ }++ .nordic-wordmark {+ font-size: 22px;+ }++ .nordic-header .top-header-items.navbar-nav,+ [dark-theme="true"] .nordic-header .top-header-items.navbar-nav {+ background: var(--nordic-bg);+ }+}++@media (max-width: 767.98px) {+ /* the Default phone tab bar, in the palette */+ .nordic-header .top-header-items.navbar-nav {+ background: var(--nordic-bg);+ border-top: 1px solid var(--nordic-line);+ box-shadow: none;+ }++ .nordic-header .top-header-items .b-icon.bi {+ font-size: 21px;+ }+}++@media (max-width: 575.98px) {+ .nordic-topbar {+ font-size: 9.5px;+ letter-spacing: .08em;+ }+}++@media (max-width: 380px) {+ .nordic-wordmark {+ font-size: 19px;+ }+}++/* ---------- menu row (desktop) ---------- */++.nordic-menu-row {+ border-top: 0;+}++.nordic-menu {+ display: flex;+ flex-wrap: wrap;+ justify-content: center;+ gap: 0 30px;+ margin: 0;+ padding: 6px 16px 14px;+ list-style: none;+}++.nordic-menu > li {+ position: relative;+}++.nordic-menu > li > a,+.nordic-menu > li > div {+ display: inline-flex;+ align-items: center;+ gap: .35rem;+ padding: 6px 0;+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .12em;+ text-decoration: none;+ text-transform: uppercase;+ cursor: pointer;+}++.nordic-menu > li > a:hover,+.nordic-menu > li:hover > div,+.nordic-menu > li:focus-within > div {+ color: var(--nordic-muted-text);+}++.nordic-menu > li.-hasSubmenu > a::after,+.nordic-menu > li.-hasSubmenu > div::after {+ content: "";+ width: 5px;+ height: 5px;+ margin-top: -3px;+ border-right: 1px solid currentColor;+ border-bottom: 1px solid currentColor;+ transform: rotate(45deg);+}++.nordic-menu .category-icon {+ display: none;+}++.nordic-menu .badge {+ padding: .25em .45em;+ font-size: 9px;+}++/* dropdowns: hidden by opacity rather than display, so the links stay reachable+ with the keyboard and :focus-within can open the panel */+.nordic-menu > li > ul {+ position: absolute;+ top: 100%;+ left: 50%;+ z-index: 1036;+ min-width: 220px;+ margin: 0;+ padding: 12px 0;+ list-style: none;+ background: var(--nordic-bg);+ border: 1px solid var(--nordic-line);+ opacity: 0;+ pointer-events: none;+ transform: translate(-50%, 6px);+ transition: opacity .15s ease, transform .15s ease;+}++.nordic-menu > li:hover > ul,+.nordic-menu > li:focus-within > ul {+ opacity: 1;+ pointer-events: auto;+ transform: translate(-50%, 0);+}++.nordic-menu ul ul {+ margin: 0;+ padding: 0 0 4px 12px;+ list-style: none;+}++.nordic-menu li.back {+ display: none;+}++.nordic-menu ul a,+.nordic-menu ul li > div {+ display: block;+ padding: 5px 20px;+ color: var(--nordic-ink);+ font-size: 13px;+ text-decoration: none;+ white-space: nowrap;+}++.nordic-menu ul li > div {+ color: var(--nordic-muted-text);+ font-size: 11px;+ letter-spacing: .1em;+ text-transform: uppercase;+}++.nordic-menu ul a:hover,+.nordic-menu ul a:focus-visible {+ background: var(--nordic-surface);+ color: var(--nordic-ink);+}++.nordic-menu .sub-cat-name-container a,+.nordic-menu .sub-cat-name-container a.text-info {+ color: var(--nordic-muted-text) !important;+ font-size: 11px;+ letter-spacing: .1em;+ text-transform: uppercase;+}++/* ---------- the drawer menu (phones, tablets) ---------- */++.b-sidebar .Menu li > a,+.b-sidebar .Menu li > div,+[dark-theme="true"] .Menu li > a,+[dark-theme="true"] .Menu li > div {+ color: var(--nordic-ink);+}++.b-sidebar .Menu li,+[dark-theme="true"] .Menu li:not(.category),+[dark-theme="true"] .Menu li.category,+[dark-theme="true"] .Menu li .back,+[dark-theme="true"] .Menu ul,+[dark-theme="true"] .Menu.-floating {+ background-color: var(--nordic-bg);+}++.b-sidebar .Menu li:hover,+[dark-theme="true"] .Menu li.category:hover,+[dark-theme="true"] .Menu li:not(.category):hover,+[dark-theme="true"] .Menu li.sub-cat-name-container:hover a {+ background-color: var(--nordic-surface);+}++/* the "Show <category>" link at the top of each submenu: Default paints it with .bg-info,+ Bootstrap's cyan, which carries light text in dark mode and all but disappears.+ !important only because the .bg-info utility itself is !important. */+.b-sidebar .Menu a.bg-info,+.nordic-menu a.bg-info,+[dark-theme="true"] .b-sidebar .Menu a.bg-info {+ background-color: var(--nordic-surface) !important;+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.b-sidebar .Menu a.bg-info:hover,+.b-sidebar .Menu a.bg-info:focus-visible,+.nordic-menu a.bg-info:hover,+.nordic-menu a.bg-info:focus-visible {+ background-color: var(--nordic-ink) !important;+ color: var(--nordic-bg);+}++/* ---------- search modal ---------- */++#search-box .modal-content,+[dark-theme="true"] #search-box .modal-content {+ background-color: var(--nordic-bg);+ color: var(--nordic-ink);+}++#search-box .search-box-text,+#search-box .search-box-select,+[dark-theme="true"] #search-box .modal-body .search-box-text,+[dark-theme="true"] #search-box .search-box-select {+ background-color: var(--nordic-bg);+ border-color: var(--nordic-line);+ color: var(--nordic-ink);+}++[dark-theme="true"] #search-box .modal-body .search-box-text::placeholder {+ color: var(--nordic-muted-text);+}++[dark-theme="true"] #search-box .input-group .search-box-button {+ color: var(--nordic-ink);+}++/* ---------- newsletter ---------- */++.newsletter.nordic-newsletter {+ margin: 72px auto 0;+ padding: 48px 16px;+ border-top: 1px solid var(--nordic-line);+ border-bottom: 1px solid var(--nordic-line);+ text-align: center;+}++.nordic-newsletter .newsletter-subscribe {+ display: flex;+ flex-direction: column;+ align-items: center;+}++.nordic-newsletter .newsletter-title {+ margin: 0 0 .35rem;+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: clamp(1.6rem, 1.3rem + 1vw, 2rem);+ font-weight: 300;+}++.nordic-newsletter .newsletter-desc {+ color: var(--nordic-muted-text);+ font-size: 14px;+}++.nordic-newsletter .newsletter-inputs {+ width: min(420px, 100%);+ margin-top: 18px;+}++.nordic-newsletter__field {+ display: flex;+ align-items: center;+ border-bottom: 1px solid var(--nordic-ink);+}++.nordic-newsletter .newsletter-email,+.nordic-newsletter .newsletter-email:focus {+ flex: 1 1 auto;+ min-width: 0;+ margin: 0;+ padding: 10px 0;+ background: transparent;+ border: 0;+ box-shadow: none;+ color: var(--nordic-ink);+ font-size: 14px;+}++.nordic-newsletter .newsletter-email::placeholder,+[dark-theme="true"] .nordic-newsletter .newsletter-email::placeholder {+ color: var(--nordic-muted-text);+}++.nordic-newsletter .newsletter-email-button,+[dark-theme="true"] .nordic-newsletter .newsletter-email-button {+ flex: none;+ padding: 10px 0 10px 12px;+ background: transparent;+ border: 0;+ color: var(--nordic-ink);+ font-size: 11px;+}++.nordic-newsletter .newsletter-email-button:hover {+ color: var(--nordic-muted-text);+}++.nordic-newsletter .newsletter-subscribe-unsubscribe {+ margin-top: 12px;+ font-size: 13px;+}++.nordic-newsletter .newsletter-result .alert {+ position: static;+ margin-top: 12px;+}++/* ---------- footer ---------- */++.nordic-footer,+[dark-theme="true"] footer.nordic-footer {+ margin-top: 72px;+ padding: 48px 0 20px;+ background-color: var(--nordic-surface);+ color: var(--nordic-muted-text);+ font-size: 13px;+}++.nordic-footer__grid {+ display: grid;+ grid-template-columns: 2fr 1fr 1fr 1fr;+ gap: 32px;+}++.nordic-footer .nordic-wordmark {+ font-size: 24px;+}++.nordic-footer__head {+ margin: 0 0 12px;+ color: var(--nordic-ink);+ font-family: var(--nordic-sans);+ font-size: 10.5px;+ font-weight: 600;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.nordic-footer .list-group {+ flex-direction: column;+ align-items: flex-start;+ justify-content: flex-start;+ gap: 2px;+}++.nordic-footer .list-group-item-action,+[dark-theme="true"] .nordic-footer .list-group-item-action {+ width: auto;+ padding: 3px 0;+ background: transparent;+ border: 0;+ color: var(--nordic-muted-text);+ font-size: 13px;+ font-weight: 400;+ letter-spacing: normal;+ text-align: left;+ text-transform: none;+}++.nordic-footer .list-group-item-action:hover,+.nordic-footer .list-group-item-action:focus-visible,+[dark-theme="true"] .nordic-footer .list-group-item-action:hover,+[dark-theme="true"] .nordic-footer .list-group-item-action:focus {+ background: transparent;+ color: var(--nordic-ink);+ text-decoration: underline;+ text-underline-offset: .2em;+}++.nordic-footer .social-icons {+ flex-direction: row;+ gap: 14px;+ margin: 18px 0 0;+ padding: 0;+}++.nordic-footer .social-icons .list-group-item {+ padding: 0;+ background: transparent;+ border: 0;+}++.nordic-footer .social-icons img {+ width: 20px;+ height: 20px;+ opacity: .7;+ filter: grayscale(1);+}++.nordic-footer .social-icons a:hover img {+ opacity: 1;+}++[dark-theme="true"] .nordic-footer .list-group.social-icons .list-group-item {+ filter: invert(1);+}++.nordic-footer__company {+ margin: 14px 0 0;+ font-size: 12px;+}++.nordic-footer__company dt {+ color: var(--nordic-ink);+ font-weight: 500;+}++.nordic-footer__company dd {+ margin-bottom: 6px;+}++.nordic-footer__lower {+ display: flex;+ flex-wrap: wrap;+ justify-content: space-between;+ gap: 8px 24px;+ margin-top: 40px;+ padding-top: 16px;+ border-top: 1px solid var(--nordic-line);+ font-size: 12px;+}++.nordic-footer__lower a {+ color: var(--nordic-ink);+}++@media (max-width: 991.98px) {+ .nordic-footer__grid {+ grid-template-columns: 1fr 1fr;+ }++ .nordic-footer__brand {+ grid-column: 1 / -1;+ }+}++@media (max-width: 575.98px) {+ .nordic-footer__grid {+ grid-template-columns: 1fr;+ gap: 24px;+ }++ .nordic-footer__lower {+ flex-direction: column;+ }+}diff --git a/src/Plugins/Theme.Nordic/Content/css/home.css b/src/Plugins/Theme.Nordic/Content/css/home.cssnew file mode 100644index 000000000..76da784c6--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/home.css@@ -0,0 +1,535 @@+/*+ Nordic Editorial - home page.+ Markup: Views/Nordic/Home/Index.cshtml and Views/Nordic/Shared/Components/HomePage*.+*/++.nordic-home {+ gap: 0;+}++/* ---------- section rhythm ---------- */++.nordic-section {+ margin-top: 64px;+}++.nordic-section-head {+ display: flex;+ flex-wrap: wrap;+ align-items: baseline;+ justify-content: space-between;+ gap: 6px 24px;+ margin-bottom: 20px;+ padding-bottom: 10px;+ border-bottom: 1px solid var(--nordic-line);+}++.nordic-section-title,+.nordic-home .nordic-section-title.generalTitle {+ margin: 0;+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: clamp(1.45rem, 1.2rem + .8vw, 1.75rem);+ font-weight: 400;+ text-align: left;+}++.nordic-section-link {+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .1em;+ text-decoration: none;+ text-transform: uppercase;+}++.nordic-section-link:hover {+ text-decoration: underline;+ text-underline-offset: .25em;+}++/* the other product components (new, best sellers, featured, personalised...) keep Default+ markup around the Nordic card; give their titles the same section treatment */+.nordic-home > .product-grid:not(.nordic-products) {+ margin-top: 64px;+}++.nordic-home > .product-grid:not(.nordic-products) > .generalTitle,+.nordic-home > .product-grid:not(.nordic-products) h2.generalTitle {+ margin-bottom: 20px;+ padding-bottom: 10px;+ border-bottom: 1px solid var(--nordic-line);+ font-size: clamp(1.45rem, 1.2rem + .8vw, 1.75rem);+ font-weight: 400;+ text-align: left !important;+}++/* ---------- slider (Widgets.Slider markup, not modified) ---------- */++.home-page #GrandCarousel .carousel-item .carousel-caption .slideRow {+ align-items: flex-end;+ margin: 0;+}++.home-page #GrandCarousel .carousel-item .carousel-caption .slideRow > div {+ justify-content: flex-end !important;+ align-items: flex-start !important;+ max-width: 560px;+ padding: 0 0 48px 48px;+ text-align: left;+}++.home-page #GrandCarousel .carousel-item .carousel-caption:has(.animate-center-title)::before {+ background: linear-gradient(20deg, rgba(20, 16, 12, .62) 0%, rgba(20, 16, 12, .32) 45%, rgba(20, 16, 12, 0) 72%);+}++.home-page #GrandCarousel .carousel-item .animate-top {+ padding: 0 0 10px;+ font-family: var(--nordic-sans);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: .16em;+ line-height: 1.4;+ text-transform: uppercase;+}++.home-page #GrandCarousel .carousel-item .animate-center-title {+ margin-bottom: 10px;+ font-family: var(--nordic-serif);+ font-size: clamp(2rem, 1.2rem + 2.2vw, 2.9rem);+ font-weight: 300;+ line-height: 1.04;+ letter-spacing: -.01em;+}++.home-page #GrandCarousel .carousel-item .animate-center-content {+ padding: 0;+ font-size: 16px;+ font-weight: 400;+ line-height: 1.5;+}++.home-page #GrandCarousel .carousel-item .animate-bottom.btn {+ width: auto;+ margin: 22px 0 0;+ padding: .75rem 1.5rem;+ border-radius: 0;+ font-size: 11.5px;+ letter-spacing: .12em;+}++.home-page #GrandCarousel .carousel-indicators [data-bs-slide-to] {+ width: 28px;+ height: 2px;+ background-color: #fff;+}++/* ---------- intro (PageBlock HomePageText) ---------- */++.nordic-intro {+ max-width: 640px;+ margin: 48px auto 0;+ text-align: center;+}++.nordic-intro .generalMarginSupporter,+.nordic-intro .page-block-body {+ padding: 0 !important;+}++.nordic-intro .generalTitle {+ margin-bottom: 14px;+ font-size: clamp(1.6rem, 1.3rem + 1vw, 2.1rem);+ text-align: center;+}++.nordic-intro .page-block-body,+.nordic-intro .page-block-body p {+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: clamp(17px, 16px + .3vw, 20px);+ font-weight: 300;+ line-height: 1.55;+}++.nordic-intro .page-block-body p:last-child {+ margin-bottom: 0;+}++/* ---------- category tiles ---------- */++.nordic-cats__grid {+ display: grid;+ grid-template-columns: repeat(auto-fill, minmax(260px, 1fr));+ gap: 10px;+}++.nordic-cats--3 .nordic-cats__grid,+.nordic-cats--6 .nordic-cats__grid {+ grid-template-columns: repeat(3, 1fr);+}++.nordic-tile {+ position: relative;+ min-width: 0;+ aspect-ratio: 4 / 3;+ overflow: hidden;+ background: var(--nordic-surface);+}++.nordic-tile__link {+ display: block;+ width: 100%;+ height: 100%;+ color: #fff;+ text-decoration: none;+}++.nordic-tile img {+ display: block;+ width: 100%;+ height: 100%;+ object-fit: cover;+ transition: transform .8s ease;+}++.nordic-tile::after {+ content: "";+ position: absolute;+ inset: 0;+ background: linear-gradient(0deg, rgba(20, 16, 12, .55) 0%, rgba(20, 16, 12, 0) 45%);+ pointer-events: none;+}++.nordic-tile:hover img,+.nordic-tile:focus-within img {+ transform: scale(1.03);+}++.nordic-tile__name,+.nordic-home .nordic-tile__name {+ position: absolute;+ left: 16px;+ bottom: 14px;+ z-index: 1;+ margin: 0;+ color: #fff;+ font-family: var(--nordic-serif);+ font-size: clamp(18px, 16px + .5vw, 22px);+ font-weight: 400;+ text-shadow: 0 1px 10px rgba(0, 0, 0, .45);+}++/* five: one large tile and four smaller ones */+@media (min-width: 768px) {+ .nordic-cats--5 .nordic-cats__grid {+ grid-template-columns: 2fr 1fr 1fr;+ grid-template-rows: repeat(2, minmax(190px, 16vw));+ }++ .nordic-cats--5 .nordic-tile {+ aspect-ratio: auto;+ }++ .nordic-cats--5 .nordic-tile:first-child {+ grid-row: span 2;+ }+}++@media (max-width: 767.98px) {+ .nordic-cats__grid,+ .nordic-cats--3 .nordic-cats__grid,+ .nordic-cats--6 .nordic-cats__grid,+ .nordic-cats--5 .nordic-cats__grid {+ grid-template-columns: repeat(2, 1fr);+ }+}++/* ---------- collections: split banners ---------- */++.nordic-colls__grid {+ display: grid;+ grid-template-columns: repeat(2, minmax(0, 1fr));+ gap: 10px;+}++.nordic-colls--1 .nordic-coll,+.nordic-colls--3 .nordic-coll:first-child {+ grid-column: 1 / -1;+}++.nordic-coll {+ display: grid;+ grid-template-columns: 1fr 1fr;+ min-width: 0;+ background: var(--nordic-surface);+}++.nordic-colls--1 .nordic-coll,+.nordic-colls--3 .nordic-coll:first-child {+ grid-template-columns: 3fr 2fr;+}++.nordic-coll__media {+ display: block;+ aspect-ratio: 4 / 3;+ overflow: hidden;+}++.nordic-colls--1 .nordic-coll__media,+.nordic-colls--3 .nordic-coll:first-child .nordic-coll__media {+ aspect-ratio: 16 / 9;+}++.nordic-coll__media img {+ display: block;+ width: 100%;+ height: 100%;+ object-fit: cover;+ transition: transform .8s ease;+}++.nordic-coll:hover .nordic-coll__media img {+ transform: scale(1.03);+}++.nordic-coll__text {+ display: flex;+ flex-direction: column;+ justify-content: center;+ align-items: flex-start;+ padding: 28px 26px;+}++.nordic-coll__name {+ margin: 0 0 8px;+ font-family: var(--nordic-serif);+ font-size: clamp(22px, 19px + .6vw, 28px);+ font-weight: 400;+}++.nordic-coll__name a {+ color: var(--nordic-ink);+ text-decoration: none;+}++.nordic-coll__desc {+ margin: 0 0 18px;+ color: var(--nordic-muted-text);+ font-size: 14px;+ line-height: 1.55;+}++@media (max-width: 767.98px) {+ .nordic-colls__grid {+ grid-template-columns: 1fr;+ }++ .nordic-coll,+ .nordic-colls--1 .nordic-coll,+ .nordic-colls--3 .nordic-coll:first-child {+ grid-template-columns: 1fr;+ }++ .nordic-coll__media,+ .nordic-colls--1 .nordic-coll__media,+ .nordic-colls--3 .nordic-coll:first-child .nordic-coll__media {+ aspect-ratio: 16 / 9;+ }+}++/* ---------- brands: editorial strip ---------- */++.nordic-brands__strip {+ display: flex;+ flex-wrap: wrap;+ justify-content: space-around;+ gap: 8px 40px;+ margin: 0;+ padding: 20px 10px;+ list-style: none;+ border-top: 1px solid var(--nordic-line);+ border-bottom: 1px solid var(--nordic-line);+}++.nordic-brands .nordic-section-head {+ border-bottom: 0;+ margin-bottom: 0;+}++.nordic-brands__link {+ display: inline-flex;+ align-items: center;+ gap: 10px;+ color: var(--nordic-muted-text);+ font-family: var(--nordic-serif);+ font-size: clamp(18px, 16px + .5vw, 22px);+ font-weight: 400;+ text-decoration: none;+ transition: color .2s ease;+}++.nordic-brands__link:hover,+.nordic-brands__link:focus-visible {+ color: var(--nordic-ink);+}++.nordic-brands__pic {+ display: none;+ width: 34px;+ height: 34px;+ object-fit: cover;+ border-radius: 50%;+}++@media (min-width: 992px) {+ .nordic-brands__pic {+ display: inline-block;+ width: 0;+ opacity: 0;+ transition: width .2s ease, opacity .2s ease;+ }++ .nordic-brands__link:hover .nordic-brands__pic,+ .nordic-brands__link:focus-visible .nordic-brands__pic {+ width: 34px;+ opacity: 1;+ }+}++/* ---------- journal ---------- */++.nordic-journal__grid {+ display: grid;+ grid-template-columns: repeat(2, minmax(0, 1fr));+ gap: 24px;+}++.nordic-post__media {+ display: block;+ aspect-ratio: 16 / 9;+ margin-bottom: 14px;+ overflow: hidden;+ background: var(--nordic-surface);+}++.nordic-post__media img {+ display: block;+ width: 100%;+ height: 100%;+ object-fit: cover;+ transition: transform .8s ease;+}++.nordic-post:hover .nordic-post__media img {+ transform: scale(1.03);+}++.nordic-post__title {+ margin: 6px 0 8px;+ font-family: var(--nordic-serif);+ font-size: clamp(19px, 17px + .5vw, 23px);+ font-weight: 400;+ line-height: 1.25;+}++.nordic-post__title a,+.nordic-news__title a {+ color: var(--nordic-ink);+ text-decoration: none;+}++.nordic-post__title a:hover,+.nordic-news__title a:hover {+ text-decoration: underline;+ text-underline-offset: .2em;+}++.nordic-post__short {+ color: var(--nordic-muted-text);+ font-size: 14px;+ line-height: 1.6;+}++.nordic-post__short p:last-child {+ margin-bottom: 0;+}++@media (max-width: 767.98px) {+ .nordic-journal__grid {+ grid-template-columns: 1fr;+ }+}++/* ---------- news: hairline strip ---------- */++.nordic-news .nordic-section-head {+ border-bottom: 0;+ margin-bottom: 0;+}++.nordic-news__strip {+ display: grid;+ grid-template-columns: repeat(3, minmax(0, 1fr));+ margin: 0;+ padding: 0;+ list-style: none;+ border-top: 1px solid var(--nordic-line);+}++.nordic-news__item {+ padding: 14px 20px 14px 0;+}++.nordic-news__item + .nordic-news__item {+ padding-left: 20px;+ border-left: 1px solid var(--nordic-line);+}++.nordic-news__title {+ margin: 4px 0 0;+ font-family: var(--nordic-serif);+ font-size: 17px;+ font-weight: 400;+ line-height: 1.35;+}++@media (max-width: 767.98px) {+ .nordic-news__strip {+ grid-template-columns: 1fr;+ }++ .nordic-news__item,+ .nordic-news__item + .nordic-news__item {+ padding: 14px 0;+ border-left: 0;+ border-bottom: 1px solid var(--nordic-line);+ }+}++/* ---------- tablet (768-991px) ---------- */++@media (min-width: 768px) and (max-width: 991.98px) {+ /* two cards a row: three left orphans with the 8 featured and 4 best-selling products */+ .nordic-home .product-grid .row > .product-container {+ flex: 0 0 50%;+ max-width: 50%;+ }++ /* collection banners one per row, image beside the text, so the text is not squeezed */+ .nordic-colls__grid {+ grid-template-columns: minmax(0, 1fr);+ }++ .nordic-coll,+ .nordic-colls--1 .nordic-coll,+ .nordic-colls--3 .nordic-coll:first-child {+ grid-template-columns: 1fr 1fr;+ }++ .nordic-coll__media,+ .nordic-colls--1 .nordic-coll__media,+ .nordic-colls--3 .nordic-coll:first-child .nordic-coll__media {+ aspect-ratio: 4 / 3;+ }+}diff --git a/src/Plugins/Theme.Nordic/Content/css/product.css b/src/Plugins/Theme.Nordic/Content/css/product.cssnew file mode 100644index 000000000..d8dee08d8--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/product.css@@ -0,0 +1,522 @@+/*+ Nordic Editorial - product page.+ Markup: Views/Nordic/Product/ProductLayout.Simple.cshtml, ProductLayout.Grouped.cshtml,+ Partials/Pictures.cshtml; every other product partial is Default markup, restyled here.+*/++/* ---------- two columns: gallery 1.25fr, info 1fr ---------- */++.nordic-pd .nordic-pd__main {+ margin: 0;+}++@media (min-width: 992px) {+ .nordic-pd .nordic-pd__gallery {+ flex: 0 0 55.5%;+ max-width: 55.5%;+ }++ .nordic-pd .nordic-pd__info {+ flex: 0 0 44.5%;+ max-width: 44.5%;+ padding-left: 48px !important;+ }+}++/* ---------- gallery: 4:5 main image, vertical thumbnail strip on desktop ---------- */++.nordic-pd .gallery img.image.main-image,+[dark-theme="true"] .nordic-pd .gallery img.image.main-image {+ display: block;+ width: 100%;+ max-width: none;+ height: auto;+ aspect-ratio: 4 / 5;+ object-fit: cover;+ background: var(--nordic-surface);+ border: 0;+}++.nordic-pd .gallery img.image.thumb-image,+[dark-theme="true"] .nordic-pd .gallery img.image.thumb-image {+ width: 72px;+ height: 90px;+ margin: 0;+ object-fit: cover;+ background: var(--nordic-surface);+ border: 1px solid transparent;+ opacity: .75;+ cursor: pointer;+}++.nordic-pd .gallery img.image.thumb-image:hover,+.nordic-pd .gallery img.image.thumb-image:focus-visible {+ border-color: var(--nordic-ink);+ opacity: 1;+}++.nordic-pd .gallery:has(.thumb-image) > div {+ display: flex;+ flex-wrap: wrap;+ gap: 8px;+ margin-top: 8px;+}++.nordic-pd .gallery:has(.thumb-image) > div > div {+ display: contents;+}++@media (min-width: 992px) {+ .nordic-pd .gallery:has(.thumb-image) {+ display: grid;+ grid-template-columns: 72px minmax(0, 1fr);+ gap: 12px;+ align-items: start;+ }++ .nordic-pd .gallery:has(.thumb-image) > img.main-image {+ grid-column: 2;+ grid-row: 1;+ }++ .nordic-pd .gallery:has(.thumb-image) > div {+ grid-column: 1;+ grid-row: 1;+ flex-direction: column;+ flex-wrap: nowrap;+ margin: 0;+ }+}++/* ---------- info column ---------- */++.nordic-pd .nordic-pd__info {+ padding-top: 8px;+}++.nordic-pd__brand a {+ color: var(--nordic-muted-text);+ font-size: 11px;+ font-weight: 500;+ letter-spacing: .14em;+ text-decoration: none;+ text-transform: uppercase;+}++.nordic-pd .nordic-pd__title,+.nordic-pd .product-name .generalTitle {+ margin: 6px 0 10px;+ font-size: clamp(1.9rem, 1.5rem + 1.2vw, 2.5rem);+ font-weight: 300;+ line-height: 1.12;+ text-align: left;+}++.nordic-pd__meta {+ display: flex;+ flex-wrap: wrap;+ align-items: center;+ gap: 4px 18px;+ color: var(--nordic-muted-text);+ font-size: 12.5px;+}++/* the brand already heads the column */+.nordic-pd__meta .product-brand {+ display: none;+}++.nordic-pd__meta .additional-details {+ display: flex;+ flex-wrap: wrap;+ gap: 4px 14px;+ margin: 0 !important;+}++.nordic-pd__meta .generalMarginSupporter {+ margin: 0;+}++.nordic-pd .label {+ color: var(--nordic-muted-text);+ font-weight: 400;+}++.nordic-pd .product-reviews-overview .btn,+[dark-theme="true"] .nordic-pd .product-reviews-overview .btn {+ padding: 0;+ background: transparent;+ border: 0;+ color: var(--nordic-muted-text);+ font-size: 12px;+ letter-spacing: normal;+ text-decoration: underline;+ text-transform: none;+ text-underline-offset: .2em;+}++/* price */+.nordic-pd .nordic-pd__price {+ margin: 18px 0 4px;+}++.nordic-pd .prices {+ margin: 0;+ padding: 0 !important;+}++.nordic-pd .product-price .actual-price,+.nordic-pd .product-price .your-price,+.nordic-pd .product-price .price-value,+.nordic-pd .product-price span,+[dark-theme="true"] .nordic-pd .product-price .actual-price {+ color: var(--nordic-ink);+ font-family: var(--nordic-serif);+ font-size: 26px;+ font-weight: 400;+}++.nordic-pd .discounted-price .actual-price,+.nordic-pd .discounted-price .your-price,+.nordic-pd .discounted-price span {+ color: var(--nordic-sale);+}++.nordic-pd .old-product-price,+.nordic-pd .old-price,+.product-details-page.nordic-pd .overview .old-price,+.nordic-pd .non-discounted-price span {+ color: var(--nordic-muted-text);+ font-size: 15px;+ text-decoration: line-through;+}++.nordic-pd .base-price-pangv,+.nordic-pd .tax-shipping-info,+.nordic-pd .nordic-pd__notes {+ color: var(--nordic-muted-text);+ font-size: 12.5px;+}++.nordic-pd .nordic-pd__notes .delivery {+ margin: 0;+}++.nordic-pd .nordic-pd__notes .b-icon {+ color: var(--nordic-muted-text);+}++.nordic-pd .short-description {+ margin: 18px 0;+ color: var(--nordic-muted-text);+ font-size: 15px;+ line-height: 1.65;+}++/* attributes */+.nordic-pd .attributes,+.nordic-pd .product-attributes {+ margin-top: 12px;+}++.nordic-pd .attributes .attribute-name,+.nordic-pd .attributes label.col-form-label,+.nordic-pd .product-attributes .col-form-label {+ color: var(--nordic-ink);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.nordic-pd .attributes,+[dark-theme="true"] .nordic-pd .attributes {+ padding: 12px 14px;+ border: 1px solid var(--nordic-line);+}++.nordic-pd .attributes .table {+ margin: 0;+}++.nordic-pd .attributes .table > :not(caption) > * > * {+ padding: 6px 0;+ border: 0;+ background: transparent;+ vertical-align: middle;+}++.nordic-pd .color-squares .color-container,+.nordic-pd .attributes .color-container {+ display: inline-block;+ width: 30px;+ height: 30px;+ padding: 2px;+ border: 1px solid var(--nordic-line);+ border-radius: 0;+}++.nordic-pd .color-squares .color,+.nordic-pd .attributes .color-container .color {+ display: block;+ width: 100%;+ height: 100%;+}++.nordic-pd .color-squares input:checked + label .color-container,+.nordic-pd .attributes .selected-value .color-container,+.nordic-pd .attributes .color-container.active {+ outline: 1px solid var(--nordic-ink);+ outline-offset: 2px;+}++/* buy row */+.nordic-pd .nordic-pd__buy {+ margin: 22px 0 0;+}++.nordic-pd .product-add-to-cart {+ gap: 8px;+}++.nordic-pd .product-add-to-cart .qty-input,+.nordic-pd .product-add-to-cart .qty-dropdown {+ max-width: 76px;+ height: 48px;+ border-radius: 0 !important;+}++.nordic-pd .add-to-cart-button,+.nordic-pd .add-to-cart-button span {+ justify-content: center;+ align-items: center;+ height: 48px;+ border-radius: 0 !important;+ font-size: 12px;+ font-weight: 600;+ letter-spacing: .12em;+}++.nordic-pd .add-to-cart-button span {+ height: auto;+}++/* reservation, gift voucher and entered-price field labels in the editorial label style */+.nordic-pd .nordic-pd__info h5,+.nordic-pd .nordic-pd__info > div > .container > .col-form-label,+.nordic-pd .giftvoucher label,+.nordic-pd .enter-price-label {+ color: var(--nordic-ink);+ font-family: var(--nordic-sans);+ font-size: 11px;+ font-weight: 600;+ letter-spacing: .12em;+ text-transform: uppercase;+}++/* perks: hairline rows */+.nordic-perks {+ margin-top: 24px;+ border-top: 1px solid var(--nordic-line);+}++.nordic-perk {+ padding: 12px 0;+ border-bottom: 1px solid var(--nordic-line);+ font-size: 13px;+}++.nordic-perk .generalMarginSupporter {+ margin: 0;+}++.nordic-perk--actions {+ display: flex;+ gap: 8px;+ width: 100%;+}++.nordic-perk--actions .btn,+[dark-theme="true"] .nordic-perk--actions .btn {+ display: inline-flex;+ align-items: center;+ justify-content: center;+ width: 40px;+ height: 40px;+ margin: 0 !important;+ padding: 0;+ border-radius: 0 !important;+ background: transparent;+ border: 1px solid var(--nordic-line);+ color: var(--nordic-ink);+}++.nordic-perk--actions .btn:hover,+.nordic-perk--actions .btn:focus-visible {+ background: var(--nordic-ink);+ border-color: var(--nordic-ink);+ color: var(--nordic-bg);+}++/* ---------- special product types: restyled, structure unchanged ---------- */++.nordic-pd .reservation-info,+.nordic-pd .auction-info,+.nordic-pd .product-bundle,+.nordic-pd .tier-prices,+.nordic-pd .giftvoucher,+.nordic-pd .download-sample {+ margin-top: 16px;+}++.nordic-pd .countdown-box,+.nordic-pd .bid-box,+.nordic-pd .alert-info {+ background: var(--nordic-surface);+ border: 0;+ border-radius: 0;+ color: var(--nordic-ink);+}++.nordic-pd .card,+[dark-theme="true"] .nordic-pd .card {+ background: transparent;+}++.nordic-pd .product-variant-line,+.nordic-pd .product-bundle .card {+ border: 0;+ border-top: 1px solid var(--nordic-line);+}++.nordic-pd #reservationDatepicker,+.nordic-pd .reservation-calendar {+ border-radius: 0;+}++/* ---------- tabs ---------- */++.nordic-pd .nav-tabs,+[dark-theme="true"] .nordic-pd .nav-tabs {+ justify-content: center;+ gap: 28px;+ margin-top: 48px;+ border-bottom: 1px solid var(--nordic-line);+}++.nordic-pd .nav-tabs .nav-link,+[dark-theme="true"] .nordic-pd .nav-tabs .nav-link,+[dark-theme="true"] .nordic-pd .nav-tabs .nav-link.active,+[dark-theme="true"] .nordic-pd .nav-tabs .nav-link:hover:not(.active) {+ padding: 10px 0;+ background: transparent;+ border: 0;+ border-bottom: 2px solid transparent;+ border-radius: 0;+ color: var(--nordic-muted-text);+ font-size: 11.5px;+ font-weight: 600;+ letter-spacing: .12em;+ text-transform: uppercase;+}++.nordic-pd .nav-tabs .nav-link.active,+[dark-theme="true"] .nordic-pd .nav-tabs .nav-link.active {+ border-bottom-color: var(--nordic-ink);+ color: var(--nordic-ink);+}++.nordic-pd .tab-content {+ max-width: 820px;+ margin: 0 auto;+ color: var(--nordic-ink);+ font-size: 15px;+ line-height: 1.7;+}++/* reviews: the average as a large serif figure */+.nordic-pd .product-review-box .rating,+.nordic-pd .review-overview .rating-value,+.nordic-pd .b-rating-value {+ font-family: var(--nordic-serif);+}++.nordic-pd .product-review-item,+.nordic-pd .review-item {+ padding: 16px 0;+ border-bottom: 1px solid var(--nordic-line);+}++/* ---------- related, also purchased, similar, recommended ---------- */++.nordic-pd .product-grid > h2,+.nordic-pd .product-grid .generalTitle,+.nordic-pd .related-products-grid h2,+.nordic-pd .also-purchased-products-grid h2 {+ margin: 56px 0 20px;+ padding-bottom: 10px;+ border-bottom: 1px solid var(--nordic-line);+ font-family: var(--nordic-serif);+ font-size: clamp(1.45rem, 1.2rem + .8vw, 1.75rem);+ font-weight: 400;+ text-align: left !important;+}++@media (max-width: 991.98px) {+ .nordic-pd .nordic-pd__info {+ padding: 20px 0 0 !important;+ }+}++/* ---------- tablet: two columns already, so price and buy row stay above the fold ---------- */++@media (min-width: 768px) and (max-width: 991.98px) {+ .nordic-pd .nordic-pd__gallery {+ flex: 0 0 50%;+ max-width: 50%;+ }++ .nordic-pd .nordic-pd__info {+ flex: 0 0 50%;+ max-width: 50%;+ padding: 0 0 0 24px !important;+ }++ .nordic-pd .nordic-pd__title,+ .nordic-pd .product-name .generalTitle {+ font-size: 1.75rem;+ }+}++/* ---------- phones ---------- */++@media (max-width: 767.98px) {+ /* tabs scroll sideways instead of wrapping onto three lines */+ .nordic-pd .tabs .nav-tabs {+ flex-wrap: nowrap;+ justify-content: flex-start !important;+ gap: 22px;+ overflow-x: auto;+ overflow-y: hidden;+ scrollbar-width: none;+ -webkit-overflow-scrolling: touch;+ }++ .nordic-pd .tabs .nav-tabs::-webkit-scrollbar {+ display: none;+ }++ .nordic-pd .tabs .nav-tabs .nav-item {+ flex: none;+ }++ .nordic-pd .tabs .nav-tabs .nav-link {+ white-space: nowrap;+ }++ /* related, also purchased, similar: two cards a row, as in the listings */+ .nordic-pd .product-grid .row > .product-container {+ flex: 0 0 50%;+ max-width: 50%;+ }+}diff --git a/src/Plugins/Theme.Nordic/Content/css/tokens.css b/src/Plugins/Theme.Nordic/Content/css/tokens.cssnew file mode 100644index 000000000..5efd86b81--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/css/tokens.css@@ -0,0 +1,71 @@+/*+ Nordic Editorial - design tokens.++ The palette lives in --nordic-*; Bootstrap's own variables are pointed at it for both+ schemes, so every component the theme does not restyle still follows the palette.+ The scheme is switched by ColorScheme.cshtml through data-bs-theme on <html>.+*/++:root,+[data-bs-theme=light] {+ --nordic-bg: #f6f3ee;+ --nordic-surface: #ece6dc;+ --nordic-ink: #23201c;+ --nordic-muted: #8a7f70;+ --nordic-line: #e2dbd0;+ --nordic-sale: #9b3d2a;+ /* --nordic-muted is 3.5:1 on bg: large text and decoration only. Small text uses --nordic-muted-text. */+ --nordic-muted-text: #6b6155;+ --nordic-on-image: #ffffff;+}++[data-bs-theme=dark] {+ --nordic-bg: #1d1b18;+ --nordic-surface: #27241f;+ --nordic-ink: #f1ece4;+ --nordic-muted: #a89c8c;+ --nordic-line: #3a352e;+ --nordic-sale: #e08a73;+ --nordic-muted-text: #a89c8c;+ --nordic-on-image: #ffffff;+}++:root,+[data-bs-theme=light],+[data-bs-theme=dark] {+ --nordic-serif: "Fraunces", Georgia, "Times New Roman", serif;+ --nordic-sans: "Inter", system-ui, -apple-system, "Segoe UI", Roboto, sans-serif;+ --nordic-track: .12em;++ --bs-body-bg: var(--nordic-bg);+ --bs-body-bg-rgb: 246, 243, 238;+ --bs-body-color: var(--nordic-ink);+ --bs-emphasis-color: var(--nordic-ink);+ --bs-secondary-color: var(--nordic-muted-text);+ --bs-tertiary-color: var(--nordic-muted-text);+ --bs-secondary-bg: var(--nordic-surface);+ --bs-tertiary-bg: var(--nordic-surface);+ --bs-border-color: var(--nordic-line);+ --bs-border-radius: 0;+ --bs-border-radius-sm: 0;+ --bs-border-radius-lg: 0;+ --bs-border-radius-xl: 0;+ --bs-link-color: var(--nordic-ink);+ --bs-link-color-rgb: 35, 32, 28;+ --bs-link-hover-color: var(--nordic-muted-text);+ --bs-link-hover-color-rgb: 107, 97, 85;+ --bs-body-font-family: var(--nordic-sans);+ --bs-heading-color: var(--nordic-ink);+ --bs-primary: var(--nordic-ink);+ --bs-primary-rgb: 35, 32, 28;+ --bs-dark: var(--nordic-ink);+ --bs-light: var(--nordic-surface);+ --bs-focus-ring-color: color-mix(in srgb, var(--nordic-ink) 25%, transparent);+}++[data-bs-theme=dark] {+ --bs-body-bg-rgb: 29, 27, 24;+ --bs-link-color-rgb: 241, 236, 228;+ --bs-link-hover-color-rgb: 168, 156, 140;+ --bs-primary-rgb: 241, 236, 228;+}diff --git a/src/Plugins/Theme.Nordic/Content/fonts/OFL-Fraunces.txt b/src/Plugins/Theme.Nordic/Content/fonts/OFL-Fraunces.txtnew file mode 100644index 000000000..22fa7ce57--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/fonts/OFL-Fraunces.txt@@ -0,0 +1,93 @@+Copyright 2018 The Fraunces Project Authors (https://github.com/undercasetype/Fraunces)++This Font Software is licensed under the SIL Open Font License, Version 1.1.+This license is copied below, and is also available with a FAQ at:+http://scripts.sil.org/OFL+++-----------------------------------------------------------+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+-----------------------------------------------------------++PREAMBLE+The goals of the Open Font License (OFL) are to stimulate worldwide+development of collaborative font projects, to support the font creation+efforts of academic and linguistic communities, and to provide a free and+open framework in which fonts may be shared and improved in partnership+with others.++The OFL allows the licensed fonts to be used, studied, modified and+redistributed freely as long as they are not sold by themselves. The+fonts, including any derivative works, can be bundled, embedded,+redistributed and/or sold with any software provided that any reserved+names are not used by derivative works. The fonts and derivatives,+however, cannot be released under any other type of license. The+requirement for fonts to remain under this license does not apply+to any document created using the fonts or their derivatives.++DEFINITIONS+"Font Software" refers to the set of files released by the Copyright+Holder(s) under this license and clearly marked as such. This may+include source files, build scripts and documentation.++"Reserved Font Name" refers to any names specified as such after the+copyright statement(s).++"Original Version" refers to the collection of Font Software components as+distributed by the Copyright Holder(s).++"Modified Version" refers to any derivative made by adding to, deleting,+or substituting -- in part or in whole -- any of the components of the+Original Version, by changing formats or by porting the Font Software to a+new environment.++"Author" refers to any designer, engineer, programmer, technical+writer or other person who contributed to the Font Software.++PERMISSION & CONDITIONS+Permission is hereby granted, free of charge, to any person obtaining+a copy of the Font Software, to use, study, copy, merge, embed, modify,+redistribute, and sell modified and unmodified copies of the Font+Software, subject to the following conditions:++1) Neither the Font Software nor any of its individual components,+in Original or Modified Versions, may be sold by itself.++2) Original or Modified Versions of the Font Software may be bundled,+redistributed and/or sold with any software, provided that each copy+contains the above copyright notice and this license. These can be+included either as stand-alone text files, human-readable headers or+in the appropriate machine-readable metadata fields within text or+binary files as long as those fields can be easily viewed by the user.++3) No Modified Version of the Font Software may use the Reserved Font+Name(s) unless explicit written permission is granted by the corresponding+Copyright Holder. This restriction only applies to the primary font name as+presented to the users.++4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+Software shall not be used to promote, endorse or advertise any+Modified Version, except to acknowledge the contribution(s) of the+Copyright Holder(s) and the Author(s) or with their explicit written+permission.++5) The Font Software, modified or unmodified, in part or in whole,+must be distributed entirely under this license, and must not be+distributed under any other license. The requirement for fonts to+remain under this license does not apply to any document created+using the Font Software.++TERMINATION+This license becomes null and void if any of the above conditions are+not met.++DISCLAIMER+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+OTHER DEALINGS IN THE FONT SOFTWARE.diff --git a/src/Plugins/Theme.Nordic/Content/fonts/OFL-Inter.txt b/src/Plugins/Theme.Nordic/Content/fonts/OFL-Inter.txtnew file mode 100644index 000000000..21f6aff96--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/fonts/OFL-Inter.txt@@ -0,0 +1,93 @@+Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)++This Font Software is licensed under the SIL Open Font License, Version 1.1.+This license is copied below, and is also available with a FAQ at:+https://scripts.sil.org/OFL+++-----------------------------------------------------------+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007+-----------------------------------------------------------++PREAMBLE+The goals of the Open Font License (OFL) are to stimulate worldwide+development of collaborative font projects, to support the font creation+efforts of academic and linguistic communities, and to provide a free and+open framework in which fonts may be shared and improved in partnership+with others.++The OFL allows the licensed fonts to be used, studied, modified and+redistributed freely as long as they are not sold by themselves. The+fonts, including any derivative works, can be bundled, embedded,+redistributed and/or sold with any software provided that any reserved+names are not used by derivative works. The fonts and derivatives,+however, cannot be released under any other type of license. The+requirement for fonts to remain under this license does not apply+to any document created using the fonts or their derivatives.++DEFINITIONS+"Font Software" refers to the set of files released by the Copyright+Holder(s) under this license and clearly marked as such. This may+include source files, build scripts and documentation.++"Reserved Font Name" refers to any names specified as such after the+copyright statement(s).++"Original Version" refers to the collection of Font Software components as+distributed by the Copyright Holder(s).++"Modified Version" refers to any derivative made by adding to, deleting,+or substituting -- in part or in whole -- any of the components of the+Original Version, by changing formats or by porting the Font Software to a+new environment.++"Author" refers to any designer, engineer, programmer, technical+writer or other person who contributed to the Font Software.++PERMISSION & CONDITIONS+Permission is hereby granted, free of charge, to any person obtaining+a copy of the Font Software, to use, study, copy, merge, embed, modify,+redistribute, and sell modified and unmodified copies of the Font+Software, subject to the following conditions:++1) Neither the Font Software nor any of its individual components,+in Original or Modified Versions, may be sold by itself.++2) Original or Modified Versions of the Font Software may be bundled,+redistributed and/or sold with any software, provided that each copy+contains the above copyright notice and this license. These can be+included either as stand-alone text files, human-readable headers or+in the appropriate machine-readable metadata fields within text or+binary files as long as those fields can be easily viewed by the user.++3) No Modified Version of the Font Software may use the Reserved Font+Name(s) unless explicit written permission is granted by the corresponding+Copyright Holder. This restriction only applies to the primary font name as+presented to the users.++4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font+Software shall not be used to promote, endorse or advertise any+Modified Version, except to acknowledge the contribution(s) of the+Copyright Holder(s) and the Author(s) or with their explicit written+permission.++5) The Font Software, modified or unmodified, in part or in whole,+must be distributed entirely under this license, and must not be+distributed under any other license. The requirement for fonts to+remain under this license does not apply to any document created+using the Font Software.++TERMINATION+This license becomes null and void if any of the above conditions are+not met.++DISCLAIMER+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM+OTHER DEALINGS IN THE FONT SOFTWARE.diff --git a/src/Plugins/Theme.Nordic/Content/fonts/README.md b/src/Plugins/Theme.Nordic/Content/fonts/README.mdnew file mode 100644index 000000000..2efff7ace--- /dev/null+++ b/src/Plugins/Theme.Nordic/Content/fonts/README.md@@ -0,0 +1,20 @@+# Fonts++Both families are licensed under the SIL Open Font License 1.1 (see `OFL-Fraunces.txt` and+`OFL-Inter.txt`). They are served from this folder; the storefront makes no request to Google Fonts.++The files are the Latin subsets of the variable fonts served by Google Fonts, downloaded once on+2026-09-26:++| File | Axes | Source |+|---|---|---|+| `fraunces-latin-var.woff2` | opsz 9–144, wght 300–600 | https://fonts.gstatic.com/s/fraunces/v38/6NU78FyLNQOQZAnv9bYEvDiIdE9Ea92uemAk_WBq8U_9v0c2Wa0KxC9TeA.woff2 |+| `inter-latin-var.woff2` | wght 400–700 | https://fonts.gstatic.com/s/inter/v20/UcC73FwrK3iLTeHuS_nVMrMxCp50SjIa1ZL7.woff2 |++They were found through+`https://fonts.googleapis.com/css2?family=Fraunces:opsz,[email protected],300;9..144,400;9..144,600&family=Inter:wght@400;500;600;700&display=swap`+(requested with a Chrome User-Agent), keeping only the `/* latin */` blocks. Google serves one+variable file per family for all requested weights, so there is one file per family here.++Licences: https://github.com/google/fonts/blob/main/ofl/fraunces/OFL.txt and+https://github.com/google/fonts/blob/main/ofl/inter/OFL.txtdiff --git a/src/Plugins/Theme.Nordic/Content/fonts/fraunces-latin-var.woff2 b/src/Plugins/Theme.Nordic/Content/fonts/fraunces-latin-var.woff2new file mode 100644index 000000000..cb295bf0eBinary files /dev/null and b/src/Plugins/Theme.Nordic/Content/fonts/fraunces-latin-var.woff2 differdiff --git a/src/Plugins/Theme.Nordic/Content/fonts/inter-latin-var.woff2 b/src/Plugins/Theme.Nordic/Content/fonts/inter-latin-var.woff2new file mode 100644index 000000000..d15208de0Binary files /dev/null and b/src/Plugins/Theme.Nordic/Content/fonts/inter-latin-var.woff2 differdiff --git a/src/Plugins/Theme.Nordic/Content/theme.jpg b/src/Plugins/Theme.Nordic/Content/theme.jpgnew file mode 100644index 000000000..8fccd53b4Binary files /dev/null and b/src/Plugins/Theme.Nordic/Content/theme.jpg differdiff --git a/src/Plugins/Theme.Nordic/Manifest.cs b/src/Plugins/Theme.Nordic/Manifest.csnew file mode 100644index 000000000..d14643db1--- /dev/null+++ b/src/Plugins/Theme.Nordic/Manifest.cs@@ -0,0 +1,9 @@+using Grand.Infrastructure.Plugins;++[assembly: PluginInfo(+ FriendlyName = "Nordic Editorial theme",+ Group = "Themes",+ SystemName = "Theme.Nordic",+ Author = "grandnode team",+ Version = "1.0.0"+)]diff --git a/src/Plugins/Theme.Nordic/NordicText.cs b/src/Plugins/Theme.Nordic/NordicText.csnew file mode 100644index 000000000..96d28917e--- /dev/null+++ b/src/Plugins/Theme.Nordic/NordicText.cs@@ -0,0 +1,22 @@+using Microsoft.Extensions.Localization;++namespace Theme.Nordic;++/// <summary>+/// Labels the Nordic views render from the plugin's own resources.+/// A theme can be chosen in settings without installing its plugin, and then the resources+/// were never added: the translation service echoes the key back. Such a label falls back+/// to the English value the plugin would have installed.+/// </summary>+public static class NordicText+{+ public static string Get(IStringLocalizer loc, string key)+ {+ var text = loc[key];+ if (text.ResourceNotFound || string.IsNullOrEmpty(text.Value) ||+ string.Equals(text.Value, key, StringComparison.OrdinalIgnoreCase))+ return NordicThemePlugin.Resources.TryGetValue(key, out var fallback) ? fallback : key;++ return text.Value;+ }+}diff --git a/src/Plugins/Theme.Nordic/NordicThemePlugin.cs b/src/Plugins/Theme.Nordic/NordicThemePlugin.csnew file mode 100644index 000000000..54b479e78--- /dev/null+++ b/src/Plugins/Theme.Nordic/NordicThemePlugin.cs@@ -0,0 +1,34 @@+using Grand.Business.Core.Interfaces.Common.Localization;+using Grand.Infrastructure.Plugins;++namespace Theme.Nordic;++/// <summary>+/// Plugin+/// </summary>+public class NordicThemePlugin(IPluginTranslateResource pluginTranslateResource) : BasePlugin, IPlugin+{+ //storefront labels the Nordic views render that Grand.Web has no resource for+ public static readonly IReadOnlyDictionary<string, string> Resources = new Dictionary<string, string> {+ ["Theme.Nordic.Badge.Auction"] = "Auction",+ ["Theme.Nordic.Badge.Bundle"] = "Bundle",+ ["Theme.Nordic.Badge.New"] = "New",+ ["Theme.Nordic.Badge.Sale"] = "Sale"+ };++ public override async Task Install()+ {+ foreach (var (name, value) in Resources)+ await pluginTranslateResource.AddOrUpdatePluginTranslateResource(name, value);++ await base.Install();+ }++ public override async Task Uninstall()+ {+ foreach (var name in Resources.Keys)+ await pluginTranslateResource.DeletePluginTranslationResource(name);++ await base.Uninstall();+ }+}diff --git a/src/Plugins/Theme.Nordic/NordicThemeView.cs b/src/Plugins/Theme.Nordic/NordicThemeView.csnew file mode 100644index 000000000..483a578c7--- /dev/null+++ b/src/Plugins/Theme.Nordic/NordicThemeView.cs@@ -0,0 +1,22 @@+using Grand.Web.Common.Themes;++namespace Theme.Nordic;++public class NordicThemeView : IThemeView+{+ public string AreaName => "";+ public string ThemeName => "Nordic";++ public ThemeInfo ThemeInfo => new("Nordic Editorial", "~/Plugins/Theme.Nordic/Content/theme.jpg",+ "Editorial storefront theme with serif display type, full-bleed imagery and dark mode", false);++ public IEnumerable<string> GetViewLocations()+ {+ return new List<string> {+ "/Views/Nordic/{1}/{0}.cshtml",+ "/Views/Nordic/Shared/{0}.cshtml",+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ };+ }+}diff --git a/src/Plugins/Theme.Nordic/StartupApplication.cs b/src/Plugins/Theme.Nordic/StartupApplication.csnew file mode 100644index 000000000..5a1d4f2bb--- /dev/null+++ b/src/Plugins/Theme.Nordic/StartupApplication.cs@@ -0,0 +1,24 @@+using Grand.Infrastructure;+using Grand.Web.Common.Themes;+using Microsoft.AspNetCore.Builder;+using Microsoft.AspNetCore.Hosting;+using Microsoft.Extensions.Configuration;+using Microsoft.Extensions.DependencyInjection;++namespace Theme.Nordic;++public class StartupApplication : IStartupApplication+{+ public void ConfigureServices(IServiceCollection services, IConfiguration configuration)+ {+ services.AddScoped<IThemeView, NordicThemeView>();+ }++ public int Priority => 10;++ public void Configure(WebApplication application, IWebHostEnvironment webHostEnvironment)+ {+ }++ public bool BeforeConfigure => false;+}\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Theme.Nordic.csproj b/src/Plugins/Theme.Nordic/Theme.Nordic.csprojnew file mode 100644index 000000000..40ad09a68--- /dev/null+++ b/src/Plugins/Theme.Nordic/Theme.Nordic.csproj@@ -0,0 +1,38 @@+<Project Sdk="Microsoft.NET.Sdk.Razor">+ <Import Project="..\..\Build\Grand.Common.props" />+ <Import Project="..\..\Build\Grand.Plugin.props" />+ <PropertyGroup>+ <AddRazorSupportForMvc>true</AddRazorSupportForMvc>+ <StaticWebAssetsEnabled>false</StaticWebAssetsEnabled>+ </PropertyGroup>++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">+ <OutputPath>..\..\Web\Grand.Web\Plugins\Theme.Nordic\</OutputPath>+ <OutDir>$(OutputPath)</OutDir>+ </PropertyGroup>++ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">+ <OutputPath>..\..\Web\Grand.Web\Plugins\Theme.Nordic\</OutputPath>+ <OutDir>$(OutputPath)</OutDir>+ </PropertyGroup>++ <ItemGroup>+ <ProjectReference Include="..\..\Web\Grand.Web\Grand.Web.csproj">+ <Private>false</Private>+ <ExcludeAssets>all</ExcludeAssets>+ </ProjectReference>+ </ItemGroup>++ <ItemGroup>+ <Folder Include="Views\" />+ </ItemGroup>+ <ItemGroup>+ <None Update="Content\**\*.*">+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>+ </None>+ <None Update="logo.jpg">+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>+ </None>+ </ItemGroup>++</Project>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/BrandLayout.GridOrLines.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/BrandLayout.GridOrLines.cshtmlnew file mode 100644index 000000000..ab1e8add8--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/BrandLayout.GridOrLines.cshtml@@ -0,0 +1,100 @@+@model BrandModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ pagebuilder.AddTitleParts(!string.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var collectionUrl = Url.RouteUrl("Brand", new { Model.SeName }, Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(collectionUrl);+ }+}++<div class="page brand-page nordic-listing">+ @*Nordic: heading panel - title and description on the surface colour beside the picture*@+ <header class="nordic-listing-head@(string.IsNullOrEmpty(Model.PictureModel?.ImageUrl) ? "" : " has-picture")">+ <div class="nordic-listing-head__text">+ <h1 class="generalTitle h2">@Model.Name</h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_top", additionalData = Model.Id })+ @*Rendering description*@+ @if (!string.IsNullOrWhiteSpace(Model.Description))+ {+ <div class="nordic-listing-head__desc collection-description" v-pre>+ @Html.Raw(Model.Description)+ </div>+ }+ </div>+ @if (!string.IsNullOrEmpty(Model.PictureModel?.ImageUrl))+ {+ <div class="nordic-listing-head__media">+ <img src="@Model.PictureModel.ImageUrl" alt="@Model.PictureModel.AlternateText" title="@Model.PictureModel.Title">+ </div>+ }+ </header>+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_before_featured_products", additionalData = Model.Id })+ @*Rendering featured products section*@+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_after_featured_products", additionalData = Model.Id })+ <div id="catalog-products" vue-island="catalog">+ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_before_filters", additionalData = Model.Id })+ <partial name="Partials/Selectors"/>+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <div class="col-12 product-grid px-0">+ <div class="row">+ <template v-for="product in catalog.Model.Products">+ <div class="col-xl-4 col-6 product-container mb-2">+ <partial name="Partials/Client/CatalogProductGridView"/>+ </div>+ </template>+ </div>+ </div>+ </template>+ <template v-else>+ <div class="product-list">+ <div class="col-12">+ <div class="row">+ <template v-for="product in catalog.Model.Products">+ <partial name="Partials/Client/CatalogProductListView"/>+ </template>+ </div>+ </div>+ </div>+ </template>+ <partial name="Partials/Pagination"/>+ </template>+ <template v-else>+ <div class="alert alerty-info my-3">+ @Loc["search.noresultstext"]+ </div>+ </template>+ </div>++ @*Rendering bottom description section*@+ @if (!string.IsNullOrWhiteSpace(Model.BottomDescription))+ {+ <div class="card brand-description">+ <div class="card-body">+ @Html.Raw(Model.BottomDescription)+ </div>+ </div>+ }++ @await Component.InvokeAsync("Widget", new { widgetZone = "branddetails_bottom", additionalData = Model.Id })+</div>++@section filters+{+ @*Rendering filtering section*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering"/>+ }+}++<partial name="Partials/ModelScript" model="Model"/>\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/CategoryLayout.GridOrLines.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/CategoryLayout.GridOrLines.cshtmlnew file mode 100644index 000000000..851881c24--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/CategoryLayout.GridOrLines.cshtml@@ -0,0 +1,243 @@+@model CategoryModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";++ pagebuilder.AddTitleParts(!string.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);+ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var categoryUrl = Url.RouteUrl("Category", new { Model.SeName }, Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(categoryUrl);+ }+}++@* Rendering category breadcrumbs*@++@section Breadcrumb+{+ @if (Model.DisplayCategoryBreadcrumb)+ {+ var count = 0;++ <ol class="breadcrumb" itemscope itemtype="https://schema.org/BreadcrumbList">+ <li class="breadcrumb-item" itemprop="itemListElement" itemscope="itemscope" itemtype="https://schema.org/ListItem">+ <a href="@Url.RouteUrl("HomePage")" title="@Loc["Categories.Breadcrumb.Top"]">+ <i class="b-icon bi bi-house-door" style="font-size:1.25em; position:relative; top:-1.25px" aria-hidden="true"></i>+ <span itemprop="name">@Loc["Products.Breadcrumb.Top"]</span>+ <span itemprop="item" itemscope itemtype="https://schema.org/Thing"+ id="@Url.RouteUrl("HomePage")">+ </span>+ <meta itemprop="position" content="@count"/>+ </a>+ </li>+ @foreach (var cat in Model.CategoryBreadcrumb)+ {+ count++;+ var isLastCategory = cat.Id == Model.Id;+ @if (isLastCategory)+ {+ <li class="breadcrumb-item active" itemprop="itemListElement" itemscope="itemscope" itemtype="https://schema.org/ListItem">+ <a>+ <strong class="current-item" itemprop="name">@cat.Name</strong>+ <span itemprop="item" itemscope itemtype="https://schema.org/Thing"+ id="@Url.RouteUrl("Category", new { cat.SeName })">+ </span>+ <meta itemprop="position" content="@count"/>+ </a>+ </li>+ }+ else+ {+ <li class="breadcrumb-item" itemprop="itemListElement" itemscope="itemscope" itemtype="https://schema.org/ListItem">+ <a href="@Url.RouteUrl("Category", new { cat.SeName })" title="@cat.Name" itemprop="item">+ <span itemprop="name">@cat.Name</span>+ <span itemprop="item" itemscope itemtype="https://schema.org/Thing"+ id="@Url.RouteUrl("Category", new { cat.SeName })">+ </span>+ <meta itemprop="position" content="@count"/>+ </a>+ </li>+ }+ }+ </ol>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_after_breadcrumb", additionalData = Model.Id })+ }+}++<div class="page category-page nordic-listing">+ @*Nordic: heading panel - title and description on the surface colour beside the picture*@+ <header class="nordic-listing-head@(string.IsNullOrEmpty(Model.PictureModel?.ImageUrl) ? "" : " has-picture")">+ <div class="nordic-listing-head__text">+ <h1 class="generalTitle h2">@Model.Name</h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_top", additionalData = Model.Id })+ @*Rendering description*@+ @if (!string.IsNullOrWhiteSpace(Model.Description))+ {+ <div class="nordic-listing-head__desc " v-pre>+ @Html.Raw(Model.Description)+ </div>+ }+ </div>+ @if (!string.IsNullOrEmpty(Model.PictureModel?.ImageUrl))+ {+ <div class="nordic-listing-head__media">+ <img src="@Model.PictureModel.ImageUrl" alt="@Model.PictureModel.AlternateText" title="@Model.PictureModel.Title">+ </div>+ }+ </header>+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_before_subcategories", additionalData = Model.Id })+ @*Rendering subcategories - Nordic: as chips*@+ @if (Model.SubCategories.Any())+ {+ <nav class="categoryGrid nordic-chips" aria-label="@Loc["Categories"]">+ <ul>+ @foreach (var item in Model.SubCategories)+ {+ <li>+ <a class="nordic-chip" href="@Url.RouteUrl("Category", new { item.SeName })" title="@item.PictureModel.Title">@item.Name</a>+ </li>+ }+ </ul>+ </nav>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_before_featured_products", additionalData = Model.Id })+ @*Rendering featured products section*@+ @if (Model.FeaturedProducts.Any())+ {+ <div class="page-separator"></div>+ <div class="col-12 product-grid featured-product-grid px-0" vue-island>+ <h2 class="h5 text-start mb-3">+ <span>@Loc["Products.FeaturedProducts"]</span>+ </h2>+ <div class="row">+ @foreach (var product in Model.FeaturedProducts)+ {+ <div class="col-xl-4 col-6 product-container mb-2">+ <partial name="Partials/CatalogProductView" model="product"/>+ </div>+ }+ </div>+ </div>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_after_featured_products", additionalData = Model.Id })+ <div id="catalog-products" vue-island="catalog">+ @await Component.InvokeAsync("Widget", new { widgetZone = "categorydetails_before_filters", additionalData = Model.Id })+ <template v-if="catalog.Model !== undefined">+ <partial name="Partials/Selectors"/>+ </template>+ @*+ The requested page is rendered on the server, so product names, prices+ and links are in the HTML source rather than only in the catalog JSON+ island. Vue takes over the moment the visitor sorts, filters or pages -+ catalog.clientRendered flips and the branch below replaces this one.++ This must NOT sit inside a <template>: a <template>'s children are inert+ and are never rendered without JavaScript.+ *@+ <div class="catalog-products-server" v-if="!catalog?.clientRendered">+ @if (Model.Products.Any())+ {+ if (Model.PagingFilteringContext.ViewMode != "list")+ {+ <div class="col-12 product-grid px-0">+ <div class="row">+ @*+ The first row is above the fold and holds the LCP candidate,+ so those cards load their image eagerly - see the note in+ Partials/CatalogProductView. Three per row at the widest+ breakpoint (col-lg-4).+ *@+ @foreach (var (product, index) in Model.Products.Select((p, i) => (p, i)))+ {+ <div class="col-xl-4 col-6 product-container mb-2">+ <partial name="Partials/CatalogProductView" model="product"+ view-data="@(new ViewDataDictionary(ViewData) { ["EagerImage"] = index < 3 })"/>+ </div>+ }+ </div>+ </div>+ }+ else+ {+ <div class="product-list">+ <div class="col-12">+ <div class="row">+ @foreach (var product in Model.Products)+ {+ <partial name="Partials/CatalogProductListView" model="product"/>+ }+ </div>+ </div>+ </div>+ }+ <partial name="Partials/PaginationLinks" model="Model.PagingFilteringContext"/>+ }+ else+ {+ <div class="alert alert-info my-3">+ @Loc["search.noresultstext"]+ </div>+ }+ </div>+ <template v-else>+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <div class="col-12 product-grid px-0">+ <div class="row">+ <template v-for="product in catalog.Model.Products">+ <div class="col-xl-4 col-6 product-container mb-2">+ <partial name="Partials/Client/CatalogProductGridView"/>+ </div>+ </template>+ </div>+ </div>+ </template>+ <template v-else>+ <div class="product-list">+ <div class="col-12">+ <div class="row">+ <template v-for="product in catalog.Model.Products">+ <partial name="Partials/Client/CatalogProductListView"/>+ </template>+ </div>+ </div>+ </div>+ </template>+ <partial name="Partials/Pagination"/>+ </template>+ <template v-else>+ <div class="alert alert-info my-3">+ @Loc["search.noresultstext"]+ </div>+ </template>+ </template>+ </div>+ @*Rendering bottom description*@+ @if (!string.IsNullOrWhiteSpace(Model.BottomDescription))+ {+ <div class="card">+ <div class="card-body">+ @Html.Raw(Model.BottomDescription)+ </div>+ </div>+ }+ @*Rendering recently viewed products section*@++ @await Component.InvokeAsync("RecentlyViewedProductsBlock", new { productThumbPictureSize = 235 })++</div>++@section filters+{+ @*Rendering filtering section*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering"/>+ }+}++<partial name="Partials/ModelScript" model="Model"/>\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/CollectionLayout.GridOrLines.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/CollectionLayout.GridOrLines.cshtmlnew file mode 100644index 000000000..08a120d90--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/CollectionLayout.GridOrLines.cshtml@@ -0,0 +1,115 @@+@model CollectionModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder+@{+ Layout = "_TwoColumns";+ pagebuilder.AddTitleParts(!string.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ var canonicalUrlsEnabled = seoSettings.CanonicalUrlsEnabled;+ if (canonicalUrlsEnabled)+ {+ var collectionUrl = Url.RouteUrl("Collection", new { Model.SeName }, Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(collectionUrl);+ }+}++<div class="page collection-page nordic-listing">+ @*Nordic: heading panel - title and description on the surface colour beside the picture*@+ <header class="nordic-listing-head@(string.IsNullOrEmpty(Model.PictureModel?.ImageUrl) ? "" : " has-picture")">+ <div class="nordic-listing-head__text">+ <h1 class="generalTitle h2">@Model.Name</h1>+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_top", additionalData = Model.Id })+ @*Rendering description*@+ @if (!string.IsNullOrWhiteSpace(Model.Description))+ {+ <div class="nordic-listing-head__desc collection-description" v-pre>+ @Html.Raw(Model.Description)+ </div>+ }+ </div>+ @if (!string.IsNullOrEmpty(Model.PictureModel?.ImageUrl))+ {+ <div class="nordic-listing-head__media">+ <img src="@Model.PictureModel.ImageUrl" alt="@Model.PictureModel.AlternateText" title="@Model.PictureModel.Title">+ </div>+ }+ </header>+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_before_featured_products", additionalData = Model.Id })+ @*Rendering featured products section*@+ @if (Model.FeaturedProducts.Any())+ {+ <div class="page-separator"></div>+ <div class="col-12 product-grid featured-product-grid px-0" vue-island>+ <h2 class="h5 text-start mb-3">+ <span>@Loc["Products.FeaturedProducts"]</span>+ </h2>+ <div class="row">+ <template v-for="product in catalog.Model.FeaturedProducts">+ <div class="col-xl-4 col-6 product-container mb-2">+ <partial name="Partials/Client/CatalogProductGridView"/>+ </div>+ </template>+ </div>+ </div>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_after_featured_products", additionalData = Model.Id })+ <div id="catalog-products" vue-island="catalog">+ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_before_filters", additionalData = Model.Id })+ <partial name="Partials/Selectors"/>+ <template v-if="catalog.Model.Products.length > 0">+ <template v-if="catalog.Model.PagingFilteringContext.ViewMode == 'grid'">+ <div class="col-12 product-grid px-0">+ <div class="row">+ <template v-for="product in catalog.Model.Products">+ <div class="col-xl-4 col-6 product-container mb-2">+ <partial name="Partials/Client/CatalogProductGridView"/>+ </div>+ </template>+ </div>+ </div>+ </template>+ <template v-else>+ <div class="product-list">+ <div class="col-12">+ <div class="row">+ <template v-for="product in catalog.Model.Products">+ <partial name="Partials/Client/CatalogProductListView"/>+ </template>+ </div>+ </div>+ </div>+ </template>+ <partial name="Partials/Pagination"/>+ </template>+ <template v-else>+ <div class="alert alert-info my-3">+ @Loc["search.noresultstext"]+ </div>+ </template>+ </div>++ @*Rendering bottom description section*@+ @if (!string.IsNullOrWhiteSpace(Model.BottomDescription))+ {+ <div class="card collection-description">+ <div class="card-body">+ @Html.Raw(Model.BottomDescription)+ </div>+ </div>+ }++ @await Component.InvokeAsync("Widget", new { widgetZone = "collectiondetails_bottom", additionalData = Model.Id })+</div>++@section filters+{+ @*Rendering filtering section*@+ @if (Model.PagingFilteringContext.SpecificationFilter.Enabled)+ {+ <partial name="Partials/Filtering"/>+ }+}++<partial name="Partials/ModelScript" model="Model"/>\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/Partials/Client/CatalogProductGridView.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/Partials/Client/CatalogProductGridView.cshtmlnew file mode 100644index 000000000..9d5f11be6--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/Partials/Client/CatalogProductGridView.cshtml@@ -0,0 +1,220 @@+@*+ Client-side *template* for a product card - not a partial with a model. It is+ inlined into a `<template v-for="product in ...">` and reads the loop variable,+ so the caller must name it `product`. Nothing checks that at compile time,+ which is why these sit under Partials/Client: `Partials/X` renders on the+ server from a real model, `Partials/Client/X` renders in the browser from+ catalog.Model.++ Server-side counterpart: Views/Nordic/Shared/Partials/CatalogProductView.cshtml.+ Keep the two in step - they must produce the same markup.+ ProductType: 0 simple, 20 reservation, 30 bundle, 40 auction.+*@+<article v-bind:class="{ mobile: isMobile()}" class="card product-box nordic-card mb-2">+ <div class="picture-container nordic-card__media">+ <a class="img-container" :href="product.Url" :title="product.DefaultPictureModel.Title">+ <img class="card-img main-product-img" :src="product.DefaultPictureModel.ImageUrl" :alt="product.DefaultPictureModel.AlternateText" loading="lazy" :title="product.DefaultPictureModel.Title">+ <template v-if="product.SecondPictureModel.ImageUrl !== null">+ <img class="card-img hover-img" :src="product.SecondPictureModel.ImageUrl" :alt="product.SecondPictureModel.AlternateText" loading="lazy">+ </template>+ </a>+ <div class="nordic-card__badges">+ <span v-if="product.ProductType == 40" class="nordic-badge nordic-badge--auction">@NordicText.Get(Loc, "Theme.Nordic.Badge.Auction")</span>+ <span v-else-if="product.ProductPrice.OldPrice" class="nordic-badge nordic-badge--sale">@NordicText.Get(Loc, "Theme.Nordic.Badge.Sale")</span>+ <span v-else-if="product.ProductType == 30" class="nordic-badge nordic-badge--bundle">@NordicText.Get(Loc, "Theme.Nordic.Badge.Bundle")</span>+ <span v-else-if="product.MarkAsNew" class="nordic-badge nordic-badge--new">@NordicText.Get(Loc, "Theme.Nordic.Badge.New")</span>+ <template v-if="product.Flag">+ <div class="product-label">+ <div class="badge text-bg-info">{{product.Flag}}</div>+ </div>+ </template>+ </div>+ <a title="@Loc["Products.QuickView"]" class="btn btn-secondary quick-view-button" data-bs-target="ModalQuickView" data-cart-action="quickview" :data-url="product.QuickViewUrl">+ <i class="b-icon bi bi-search" aria-hidden="true"></i>+ <span>@Loc["Products.QuickView"]</span>+ </a>+ </div>+ <div class="card-body nordic-card__body">+ <div v-if="product.BrandName" class="nordic-card__brand">{{product.BrandName}}</div>+ <h3 class="card-title nordic-card__name mb-0">+ <a :href="product.Url">{{product.Name}}</a>+ </h3>+ <template v-if="product.ShowSku && product.Sku !== null">+ <span class="sku">{{product.Sku}}</span>+ </template>+ <div class="prices-rating">+ <div class="prices nordic-card__price" v-bind:class="{ 'is-sale': !!product.ProductPrice.OldPrice, 'reservation-price': product.ProductType == 20 }">+ <template v-if="product.ProductType != 40">+ <div class="actual-price price">+ {{product.ProductPrice.Price}}+ <template v-if="product.ProductPrice.CallForPrice">+ @Loc["Products.CallForPrice"]+ </template>+ </div>+ </template>+ <template v-else>+ <div class="actual-price price">+ <template v-if="product.ProductPrice.HighestBidValue > 0 ">+ {{product.ProductPrice.HighestBid}}+ </template>+ <template v-else>+ {{product.ProductPrice.StartPrice}}+ </template>+ </div>+ </template>+ <template v-if="product.ProductPrice.OldPrice">+ <div class="old-price price">+ {{product.ProductPrice.OldPrice}}+ </div>+ </template>+ </div>+ <template v-if="product.ProductType == 40">+ <template v-if="product.EndTime !== null">+ <div class="countdown-box nordic-card__countdown">+ <template v-if="new Date(product.EndTime).getTime() > new Date().getTime()">+ <countdown :end-time="new Date(product.EndTime).getTime()">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>+ <span>{{ `${timeObj.d}` }}@Loc["Countdown.Days"]</span>+ <span>{{ `${timeObj.h}` }}@Loc["Countdown.Hours"]</span>+ <span>{{ `${timeObj.m}` }}@Loc["Countdown.Minutes"]</span>+ <span>{{ `${timeObj.s}` }}@Loc["Countdown.Seconds"]</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ </template>+ <template v-else>+ <div class="d-inline-flex flex-wrap">+ <label class="ended-label mb-0">@Loc["ShoppingCart.Auctionends"]:</label>+ <div class="count-date" v-html="new Date(product.EndTimeLocalTime).toLocaleString()"></div>+ </div>+ </template>+ </div>+ </template>+ </template>+ <template v-if="product.ReviewOverviewModel.AllowCustomerReviews">+ <div class="rating">+ <template v-if="product.ReviewOverviewModel.TotalReviews > 0">+ <b-form-rating :id="'rating-inline-grid-' + product.Id" class="p-0" variant="warning" aria-label="Rating" no-border size="sm" show-value precision="2" readonly inline :value="product.ReviewOverviewModel.RatingSum / product.ReviewOverviewModel.TotalReviews"></b-form-rating>+ </template>+ <template v-else>+ <b-form-rating :id="'rating-inline-grid-' + product.Id" class="p-0" variant="warning" no-border size="sm" show-value precision="2" readonly inline :value="0"></b-form-rating>+ </template>+ <a :href="product.Url">{{product.ReviewOverviewModel.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</a>+ </div>+ </template>+ </div>+ </div>+ <div class="card-footer nordic-card__footer">+ <template v-if="product.SpecificationAttributeModels.length > 0">+ <div class="spec-container">+ <table>+ <tbody>+ <tr class="attr" v-for="item in product.SpecificationAttributeModels" v-bind:id="item.SpecificationAttributeId">+ <td>+ <div class="spec-name">+ {{item.SpecificationAttributeName}}+ </div>+ </td>+ <td>+ <div class="spec-value">+ <span v-html="item.ValueRaw"></span>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template>+ <template v-if="product.ProductAttributeModels.length > 0">+ <div class="attr-container">+ <table>+ <tbody>+ <tr v-for="item in product.ProductAttributeModels" v-bind:id="item.ProductAttributeId" class="attr" v-bind:class="{ 'attr--color': item.AttributeControlType == 40 }">+ <td>+ <div class="attr-name">+ {{item.Name}}+ </div>+ </td>+ <td>+ <div class="attr-value">+ <template v-for="spec in item.Values">+ <template v-if="item.AttributeControlType == 1 || item.AttributeControlType == 2 || item.AttributeControlType == 3 || item.AttributeControlType == 50">+ <a class="btn btn-sm btn-light name" :href="'/'+ product.SeName + '?' + item.Name + '=' + spec.Name">+ {{spec.Name}}+ </a>+ </template>+ <template v-if="item.AttributeControlType == 40">+ <template v-if="spec.PictureModel.FullSizeImageUrl !== null">+ <a class="btn btn-sm btn-light name color-container" :title="spec.Name" @@click="productImage($event)" :data-href="spec.PictureModel.FullSizeImageUrl">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </a>+ </template>+ <template v-else>+ <a class="btn btn-sm btn-light name color-container" :title="spec.Name" :href="'/'+ product.SeName + '?' + item.Name + '=' + spec.Name">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </a>+ </template>+ </template>+ <template v-if="item.AttributeControlType == 45">+ <template v-if="spec.PictureModel.FullSizeImageUrl !== null">+ <a class="btn btn-sm btn-light p-1 name image-container" v-on:click="productImage" :data-href="spec.PictureModel.FullSizeImageUrl">+ <img :src="spec.ImageSquaresPictureModel?.ImageUrl" :alt="spec.Name"/>+ </a>+ </template>+ <template v-else>+ <a class="btn btn-sm btn-light p-1 name image-container" :href="'/'+ product.SeName + '?' + item.Name + '=' + spec.Name">+ <img :src="spec.ImageSquaresPictureModel?.ImageUrl" :alt="spec.Name"/>+ </a>+ </template>+ </template>+ </template>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template>+ <div class="desc" v-html="product.ShortDescription"></div>+ <template v-if="product.ShowQty">+ <input class="form-control input-group-addon catalog-quantity" type="number" min="1" :id="'addtocart_' + product.Id + '_EnteredQuantity'" :name="'addtocart_' + product.Id + '_EnteredQuantity'" value="1">+ </template>+ <div class="btn-group nordic-card__actions">+ <template v-if="!product.ProductPrice.DisableBuyButton">+ <button class="btn btn-info nordic-card__cart" data-cart-action="add" :data-url="product.AddToCartUrl" :data-show-qty="product.ShowQty" :data-product-id="product.Id">+ <i class="b-icon bi bi-bag" aria-hidden="true"></i>+ <span class="add-cart-text">+ <template v-if="product.ProductPrice.AvailableForPreOrder">@Loc["ShoppingCart.PreOrder"]</template>+ <template v-else-if="product.ProductType == 20">@Loc["ShoppingCart.Reservation"]</template>+ <template v-else>@Loc["ShoppingCart.AddToCart"]</template>+ </span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ </template>+ <template v-else>+ <template v-if="product.ProductType == 40">+ <button class="btn btn-info nordic-card__cart" data-cart-action="add" :data-url="product.AddToCartUrl" data-show-qty="false" :data-product-id="product.Id">+ <i class="b-icon bi bi-hammer" aria-hidden="true"></i>+ <span class="add-cart-text">@Loc["ShoppingCart.Bids"]</span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ </template>+ </template>+ <template v-if="!product.ProductPrice.DisableWishlistButton && product.ProductType == 0">+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-secondary nordic-card__icon" data-cart-action="add" :data-url="product.AddToWishlistUrl" :data-show-qty="product.ShowQty" :data-product-id="product.Id">+ <i class="b-icon bi bi-heart" aria-hidden="true"></i>+ <span class="visually-hidden">AddToWishlist</span>+ </button>+ </template>+ <template v-if="!product.ProductPrice.DisableAddToCompareListButton && product.ProductType == 0">+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-secondary nordic-card__icon" data-cart-action="compare" :data-product-id="product.Id">+ <span class="visually-hidden">AddToCompareList</span>+ <i class="b-icon bi bi-shuffle" aria-hidden="true"></i>+ </button>+ </template>+ </div>+ </div>+</article>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/Partials/Client/CatalogProductListView.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/Partials/Client/CatalogProductListView.cshtmlnew file mode 100644index 000000000..ca6ce7b79--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Catalog/Partials/Client/CatalogProductListView.cshtml@@ -0,0 +1,218 @@+@*+ Client-side *template* for a product row - not a partial with a model. Inlined into a+ `<template v-for="product in ...">`; the caller must name the loop variable+ `product`. See Partials/Client/CatalogProductGridView.cshtml.++ Server-side counterpart: Views/Nordic/Shared/Partials/CatalogProductListView.cshtml.+ ProductType: 0 simple, 20 reservation, 30 bundle, 40 auction.+*@+<div class="w-100 mb-3 border-bottom nordic-list-row">+<article v-bind:class="{ mobile: isMobile()}" class="card product-box list nordic-card nordic-card--list mb-3">+ <div class="picture-container nordic-card__media">+ <a class="img-container" :href="product.Url" :title="product.DefaultPictureModel.Title">+ <img class="card-img main-product-img" :src="product.DefaultPictureModel.ImageUrl" :alt="product.DefaultPictureModel.AlternateText" loading="lazy" :title="product.DefaultPictureModel.Title">+ <template v-if="product.SecondPictureModel.ImageUrl !== null">+ <img class="card-img hover-img" :src="product.SecondPictureModel.ImageUrl" :alt="product.SecondPictureModel.AlternateText" loading="lazy">+ </template>+ </a>+ <div class="nordic-card__badges">+ <span v-if="product.ProductType == 40" class="nordic-badge nordic-badge--auction">@NordicText.Get(Loc, "Theme.Nordic.Badge.Auction")</span>+ <span v-else-if="product.ProductPrice.OldPrice" class="nordic-badge nordic-badge--sale">@NordicText.Get(Loc, "Theme.Nordic.Badge.Sale")</span>+ <span v-else-if="product.ProductType == 30" class="nordic-badge nordic-badge--bundle">@NordicText.Get(Loc, "Theme.Nordic.Badge.Bundle")</span>+ <span v-else-if="product.MarkAsNew" class="nordic-badge nordic-badge--new">@NordicText.Get(Loc, "Theme.Nordic.Badge.New")</span>+ <template v-if="product.Flag">+ <div class="product-label">+ <div class="badge text-bg-info">{{product.Flag}}</div>+ </div>+ </template>+ </div>+ <a title="@Loc["Products.QuickView"]" class="btn btn-secondary quick-view-button" data-bs-target="ModalQuickView" data-cart-action="quickview" :data-url="product.QuickViewUrl">+ <i class="b-icon bi bi-search" aria-hidden="true"></i>+ <span>@Loc["Products.QuickView"]</span>+ </a>+ </div>+ <div class="card-body nordic-card__body">+ <div v-if="product.BrandName" class="nordic-card__brand">{{product.BrandName}}</div>+ <h3 class="card-title nordic-card__name mb-0">+ <a :href="product.Url">{{product.Name}}</a>+ </h3>+ <template v-if="product.ShowSku && product.Sku !== null">+ <span class="sku">{{product.Sku}}</span>+ </template>+ <div class="prices-rating">+ <div class="prices nordic-card__price" v-bind:class="{ 'is-sale': !!product.ProductPrice.OldPrice, 'reservation-price': product.ProductType == 20 }">+ <template v-if="product.ProductType != 40">+ <div class="actual-price price">+ {{product.ProductPrice.Price}}+ <template v-if="product.ProductPrice.CallForPrice">+ @Loc["Products.CallForPrice"]+ </template>+ </div>+ </template>+ <template v-else>+ <div class="actual-price price">+ <template v-if="product.ProductPrice.HighestBidValue > 0 ">+ {{product.ProductPrice.HighestBid}}+ </template>+ <template v-else>+ {{product.ProductPrice.StartPrice}}+ </template>+ </div>+ </template>+ <template v-if="product.ProductPrice.OldPrice">+ <div class="old-price price">+ {{product.ProductPrice.OldPrice}}+ </div>+ </template>+ </div>+ <template v-if="product.ProductType == 40">+ <template v-if="product.EndTime !== null">+ <div class="countdown-box nordic-card__countdown">+ <template v-if="new Date(product.EndTime).getTime() > new Date().getTime()">+ <countdown :end-time="new Date(product.EndTime).getTime()">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>+ <span>{{ `${timeObj.d}` }}@Loc["Countdown.Days"]</span>+ <span>{{ `${timeObj.h}` }}@Loc["Countdown.Hours"]</span>+ <span>{{ `${timeObj.m}` }}@Loc["Countdown.Minutes"]</span>+ <span>{{ `${timeObj.s}` }}@Loc["Countdown.Seconds"]</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ </template>+ <template v-else>+ <div class="d-inline-flex flex-wrap">+ <label class="ended-label mb-0">@Loc["ShoppingCart.Auctionends"]:</label>+ <div class="count-date" v-html="new Date(product.EndTimeLocalTime).toLocaleString()"></div>+ </div>+ </template>+ </div>+ </template>+ </template>+ <template v-if="product.ReviewOverviewModel.AllowCustomerReviews">+ <div class="rating">+ <template v-if="product.ReviewOverviewModel.TotalReviews > 0">+ <b-form-rating :id="'rating-inline-grid-' + product.Id" class="p-0" variant="warning" aria-label="Rating" no-border size="sm" show-value precision="2" readonly inline :value="product.ReviewOverviewModel.RatingSum / product.ReviewOverviewModel.TotalReviews"></b-form-rating>+ </template>+ <template v-else>+ <b-form-rating :id="'rating-inline-grid-' + product.Id" class="p-0" variant="warning" no-border size="sm" show-value precision="2" readonly inline :value="0"></b-form-rating>+ </template>+ <a :href="product.Url">{{product.ReviewOverviewModel.TotalReviews}} @Loc["Reviews.Overview.Reviews"]</a>+ </div>+ </template>+ </div>+ </div>+ <div class="card-footer nordic-card__footer">+ <template v-if="product.SpecificationAttributeModels.length > 0">+ <div class="spec-container">+ <table>+ <tbody>+ <tr class="attr" v-for="item in product.SpecificationAttributeModels" v-bind:id="item.SpecificationAttributeId">+ <td>+ <div class="spec-name">+ {{item.SpecificationAttributeName}}+ </div>+ </td>+ <td>+ <div class="spec-value">+ <span v-html="item.ValueRaw"></span>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template>+ <template v-if="product.ProductAttributeModels.length > 0">+ <div class="attr-container">+ <table>+ <tbody>+ <tr v-for="item in product.ProductAttributeModels" v-bind:id="item.ProductAttributeId" class="attr" v-bind:class="{ 'attr--color': item.AttributeControlType == 40 }">+ <td>+ <div class="attr-name">+ {{item.Name}}+ </div>+ </td>+ <td>+ <div class="attr-value">+ <template v-for="spec in item.Values">+ <template v-if="item.AttributeControlType == 1 || item.AttributeControlType == 2 || item.AttributeControlType == 3 || item.AttributeControlType == 50">+ <a class="btn btn-sm btn-light name" :href="'/'+ product.SeName + '?' + item.Name + '=' + spec.Name">+ {{spec.Name}}+ </a>+ </template>+ <template v-if="item.AttributeControlType == 40">+ <template v-if="spec.PictureModel.FullSizeImageUrl !== null">+ <a class="btn btn-sm btn-light name color-container" :title="spec.Name" @@click="productImage($event)" :data-href="spec.PictureModel.FullSizeImageUrl">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </a>+ </template>+ <template v-else>+ <a class="btn btn-sm btn-light name color-container" :title="spec.Name" :href="'/'+ product.SeName + '?' + item.Name + '=' + spec.Name">+ <span class="color" :style="'background-color:' + spec.ColorSquaresRgb"> </span>+ </a>+ </template>+ </template>+ <template v-if="item.AttributeControlType == 45">+ <template v-if="spec.PictureModel.FullSizeImageUrl !== null">+ <a class="btn btn-sm btn-light p-1 name image-container" v-on:click="productImage" :data-href="spec.PictureModel.FullSizeImageUrl">+ <img :src="spec.ImageSquaresPictureModel?.ImageUrl" :alt="spec.Name"/>+ </a>+ </template>+ <template v-else>+ <a class="btn btn-sm btn-light p-1 name image-container" :href="'/'+ product.SeName + '?' + item.Name + '=' + spec.Name">+ <img :src="spec.ImageSquaresPictureModel?.ImageUrl" :alt="spec.Name"/>+ </a>+ </template>+ </template>+ </template>+ </div>+ </td>+ </tr>+ </tbody>+ </table>+ </div>+ </template>+ <div class="desc" v-html="product.ShortDescription"></div>+ <template v-if="product.ShowQty">+ <input class="form-control input-group-addon catalog-quantity" type="number" min="1" :id="'addtocart_' + product.Id + '_EnteredQuantity'" :name="'addtocart_' + product.Id + '_EnteredQuantity'" value="1">+ </template>+ <div class="btn-group nordic-card__actions">+ <template v-if="!product.ProductPrice.DisableBuyButton">+ <button class="btn btn-info nordic-card__cart" data-cart-action="add" :data-url="product.AddToCartUrl" :data-show-qty="product.ShowQty" :data-product-id="product.Id">+ <i class="b-icon bi bi-bag" aria-hidden="true"></i>+ <span class="add-cart-text">+ <template v-if="product.ProductPrice.AvailableForPreOrder">@Loc["ShoppingCart.PreOrder"]</template>+ <template v-else-if="product.ProductType == 20">@Loc["ShoppingCart.Reservation"]</template>+ <template v-else>@Loc["ShoppingCart.AddToCart"]</template>+ </span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ </template>+ <template v-else>+ <template v-if="product.ProductType == 40">+ <button class="btn btn-info nordic-card__cart" data-cart-action="add" :data-url="product.AddToCartUrl" data-show-qty="false" :data-product-id="product.Id">+ <i class="b-icon bi bi-hammer" aria-hidden="true"></i>+ <span class="add-cart-text">@Loc["ShoppingCart.Bids"]</span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ </template>+ </template>+ <template v-if="!product.ProductPrice.DisableWishlistButton && product.ProductType == 0">+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-secondary nordic-card__icon" data-cart-action="add" :data-url="product.AddToWishlistUrl" :data-show-qty="product.ShowQty" :data-product-id="product.Id">+ <i class="b-icon bi bi-heart" aria-hidden="true"></i>+ <span class="visually-hidden">AddToWishlist</span>+ </button>+ </template>+ <template v-if="!product.ProductPrice.DisableAddToCompareListButton && product.ProductType == 0">+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-secondary nordic-card__icon" data-cart-action="compare" :data-product-id="product.Id">+ <span class="visually-hidden">AddToCompareList</span>+ <i class="b-icon bi bi-shuffle" aria-hidden="true"></i>+ </button>+ </template>+ </div>+ </div>+</article>+</div>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Home/Index.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Home/Index.cshtmlnew file mode 100644index 000000000..76e995fd6--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Home/Index.cshtml@@ -0,0 +1,70 @@+@using Grand.Business.Core.Interfaces.Storage+@inject IPictureService pictureService+@inject SeoSettings seoSettings+@{+ Layout = "_SingleColumn";+}++@section meta {+ @if (seoSettings.OpenGraphMetaTags)+ {+ <meta property="og:type" content="website"/>+ <meta property="og:title" content="@seoSettings.DefaultTitle"/>+ <meta property="og:description" content="@Html.Encode(seoSettings.DefaultMetaDescription)"/>+ @if (!string.IsNullOrWhiteSpace(seoSettings.StorePictureId))+ {+ var picture = await pictureService.GetPictureUrl(seoSettings.StorePictureId);+ <meta property="og:image" content="@picture"/>+ }++ <meta property="og:url" content="@Url.ActionContext.HttpContext.Request.GetEncodedUrl()"/>+ }+ @if (seoSettings.TwitterMetaTags)+ {+ <meta property="twitter:card" content="summary"/>+ <meta property="twitter:site" content="@seoSettings.DefaultTitle"/>+ <meta property="twitter:title" content="@seoSettings.DefaultTitle"/>+ <meta property="twitter:description" content="@Html.Encode(seoSettings.DefaultMetaDescription)"/>+ @if (!string.IsNullOrWhiteSpace(seoSettings.StorePictureId))+ {+ var picture = await pictureService.GetPictureUrl(seoSettings.StorePictureId);+ <meta property="twitter:image" content="@picture"/>+ }++ <meta property="twitter:url" content="@Url.ActionContext.HttpContext.Request.GetEncodedUrl()"/>+ }+}++@*+ Nordic: sections in the editorial order of the spec (collections before brands, the+ journal before news). Each "home_page_before_X" zone moves with its section, so it still+ renders directly before it. DisplayOrderHomePage keeps working: every section still+ carries its order-N class inside this flex column.+*@+<div class="page home-page nordic-home custom-container d-flex flex-column mt-0">+ @await Component.InvokeAsync("PushNotificationsRegistration")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_top" })+ <div class="nordic-intro">+ @await Component.InvokeAsync("PageBlock", new { systemName = "HomePageText" })+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_categories" })+ @await Component.InvokeAsync("HomePageCategories")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_products" })+ @await Component.InvokeAsync("PersonalizedProducts")+ @await Component.InvokeAsync("CustomerRecommendedProducts")+ @await Component.InvokeAsync("SuggestedProducts")+ @await Component.InvokeAsync("HomePageProducts")+ @await Component.InvokeAsync("HomePageNewProducts")+ @await Component.InvokeAsync("CategoryFeaturedProducts")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_best_sellers" })+ @await Component.InvokeAsync("HomePageBestSellers")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_collections" })+ @await Component.InvokeAsync("HomePageCollections")+ @await Component.InvokeAsync("CollectionFeaturedProducts")+ @await Component.InvokeAsync("HomePageBrands")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_blog" })+ @await Component.InvokeAsync("HomePageBlog")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_before_news" })+ @await Component.InvokeAsync("HomePageNews")+ @await Component.InvokeAsync("Widget", new { widgetZone = "home_page_bottom" })+</div>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Product/Partials/Pictures.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Product/Partials/Pictures.cshtmlnew file mode 100644index 000000000..9688ab8ac--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Product/Partials/Pictures.cshtml@@ -0,0 +1,101 @@+@model ProductDetailsModel+@{+ var galleryImages = Model.PictureModels.Select((picture, i) => new {+ url = i == 0 ? picture.FullSizeImageUrl : picture.ImageUrl,+ fullimg = picture.FullSizeImageUrl,+ alt = picture.AlternateText,+ title = picture.Title+ });+ }++@*Nordic: the column is sized by product.css (1.25fr / 1fr); the thumbnail strip is laid out there too*@+<div class="col-12 px-0 nordic-pd__gallery">+ <div class="gallery">+ @if (Model.PictureModels.Any())+ {+ @*+ <meta> rather than a hidden <img>: the image only had to carry the+ schema.org property, but display:none does not stop a download, so+ every product page fetched the full-size picture a second time and+ let it compete with the one actually being displayed.+ *@+ var schemaPicture = Model.PictureModels.FirstOrDefault();+ <meta itemprop="image" content="@schemaPicture?.FullSizeImageUrl">+ }+ @if (Model.PictureModels.Count == 1)+ {+ @if (Model.DefaultPictureZoomEnabled)+ {+ <gallery-images></gallery-images>++ @* The template is a JS string, not a <script type="text/html"> element:+ Vue 3 strips <script> tags out of the in-DOM template and replaces+ #app's content on mount, so a '#id' template reference resolves to+ nothing and the component renders empty. *@+ <script type="application/json" data-grand-vm="productGallery">@Json.Serialize(new {+ componentName = "gallery-images",+ variant = "main",+ mainImageId = $"main-product-img-{Model.Id}",+ images = galleryImages+ })</script>+ }+ else+ {+ <img id="[email protected]" class="image main-image" fetchpriority="high"+ src="@Model.DefaultPictureModel.ImageUrl"+ alt="@Model.DefaultPictureModel.AlternateText"+ title="@Model.DefaultPictureModel.Title"/>+ }+ }+ @if (Model.PictureModels.Count == 0)+ {+ <img id="[email protected]" class="image main-image" fetchpriority="high"+ src="@Model.DefaultPictureModel.ImageUrl"+ alt="@Model.DefaultPictureModel.AlternateText"+ title="@Model.DefaultPictureModel.Title"/>+ }+ @if (Model.DefaultPictureZoomEnabled)+ {+ @if (Model.PictureModels.Count > 1)+ {+ <img id="[email protected]" class="image main-image zoom" fetchpriority="high"+ src="@Model.DefaultPictureModel.ImageUrl"+ alt="@Model.DefaultPictureModel.AlternateText"+ title="@Model.DefaultPictureModel.Title"+ onclick="document.querySelector('.thumb-image').click()"/>++ <gallery-images></gallery-images>+ <script type="application/json" data-grand-vm="productGallery">@Json.Serialize(new {+ componentName = "gallery-images",+ variant = "thumb",+ mainImageId = $"main-product-img-{Model.Id}",+ images = galleryImages+ })</script>+ }+ }+ else+ {+ @if (Model.PictureModels.Count > 1)+ {+ <img id="[email protected]" class="image main-image" fetchpriority="high"+ src="@Model.DefaultPictureModel.ImageUrl"+ alt="@Model.DefaultPictureModel.AlternateText"+ title="@Model.DefaultPictureModel.Title"/>+ <div>+ @foreach (var picture in Model.PictureModels)+ {+ <img class="image thumb-image"+ src="@picture.ThumbImageUrl"+ alt="@picture.AlternateText"+ title="@picture.Title"+ data-src="@picture.ImageUrl"+ data-gallery-thumb/>+ }+ </div>+ <script type="application/json" data-grand-vm="galleryThumbnails">@Json.Serialize(new {+ mainImageId = $"main-product-img-{Model.Id}"+ })</script>+ }+ }+ </div>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Product/ProductLayout.Grouped.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Product/ProductLayout.Grouped.cshtmlnew file mode 100644index 000000000..1038aa3f8--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Product/ProductLayout.Grouped.cshtml@@ -0,0 +1,241 @@+@model ProductDetailsModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder++@{+ Layout = "_SingleColumn";++ //title, meta+ pagebuilder.AddTitleParts(!string.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ //canonical URL+ if (seoSettings.CanonicalUrlsEnabled)+ {+ var productUrl = Url.RouteUrl("Product", new { Model.SeName }, Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(productUrl);+ }+}++@section meta{++ @if (seoSettings.OpenGraphMetaTags)+ {+ <meta property="og:type" content="product"/>+ <meta property="og:title" content="@Html.Encode(Model.Name)"/>+ <meta property="og:description" content="@Html.Encode(Model.MetaDescription)"/>+ <meta property="og:image" content="@Model.DefaultPictureModel.ImageUrl"/>+ <meta property="og:image:url" content="@Model.DefaultPictureModel.ImageUrl"/>+ <meta property="og:url" content="@Url.ActionContext.HttpContext.Request.GetEncodedUrl()"/>+ <meta property="og:site_name" content="@Html.Encode(Model.CurrentStoreName)"/>+ }+ @if (seoSettings.TwitterMetaTags)+ {+ <meta property="twitter:card" content="summary"/>+ <meta property="twitter:site" content="@Html.Encode(Model.CurrentStoreName)"/>+ <meta property="twitter:title" content="@Html.Encode(Model.Name)"/>+ <meta property="twitter:description" content="@Html.Encode(Model.MetaDescription)"/>+ <meta property="twitter:image" content="@Model.DefaultPictureModel.ImageUrl"/>+ <meta property="twitter:url" content="@Url.ActionContext.HttpContext.Request.GetEncodedUrl()"/>+ }++ @*Product JSON-LD - see the note in Partials/ProductStructuredData*@+ <partial name="Partials/ProductStructuredData" model="Model"/>+}++<!--product breadcrumb-->++@section Breadcrumb+{+ <partial name="Partials/Breadcrumbs" model="Model.Breadcrumb"/>+}++@await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_after_breadcrumb", additionalData = Model.Id })+<div class="page product-details-page product-standard product-grouped nordic-pd" vue-island="productreviews productreviewsoverview">+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_top", additionalData = Model.Id })+ <validation-observer ref="ProductFormObserver">+ <div itemscope itemtype="https://schema.org/Product" data-productid="@Model.Id">+ <div class="product-essential">+ <div class="container">+ <div class="row nordic-pd__main">+ <vc:widget widget-zone="productdetails_before_pictures" additional-data="@Model.Id"></vc:widget>+ <!--product pictures-->+ <partial name="Partials/Pictures" model="Model"/>+ <vc:widget widget-zone="productdetails_after_pictures" additional-data="@Model.Id"></vc:widget>+ <div class="col-12 overview nordic-pd__info">+ @if (!string.IsNullOrEmpty(Model.Flag))+ {+ <div class="product-label">+ <div class="badge text-bg-info">@Model.Flag</div>+ </div>+ }+ <partial name="Partials/Unavailable" model="Model"/>+ @if (!string.IsNullOrEmpty(Model.BrandModel?.Name))+ {+ <div class="nordic-pd__brand">+ <a href="@Url.RouteUrl("Brand", new { Model.BrandModel.SeName })">@Model.BrandModel.Name</a>+ </div>+ }+ <div class="product-name">+ <h1 class="generalTitle nordic-pd__title mb-3" itemprop="name">+ @Model.Name+ </h1>+ </div>+ @if (!string.IsNullOrEmpty(Model.ShortDescription))+ {+ <div class="short-description mb-3" v-pre>+ @Html.Raw(Model.ShortDescription)+ </div>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_overview_top", additionalData = Model.Id })+ <!--product reviews-->+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <partial name="Partials/ProductReviewOverview" model="Model.ProductReviewOverview"/>+ }+ <!--product collections-->+ @if (Model.ProductCollections.Any())+ {+ <partial name="Partials/Collections" model="Model.ProductCollections"/>+ }+ <!--warehouses-->+ @if (Model.AllowToSelectWarehouse)+ {+ <partial name="Partials/Warehouses" model="Model"/>+ }+ <!--compare, email a friend-->+ <div class="btn-group mt-2 mb-3 w-100" role="group">+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_inside_overview_buttons_before", additionalData = Model.Id })+ <partial name="Partials/ProductsComparison" model="Model"/>+ <partial name="Partials/SendFriend" model="Model"/>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_inside_overview_buttons_after", additionalData = Model.Id })+ </div>+ <partial name="Partials/ShareButton" model="Model"/>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_overview_bottom", additionalData = Model.Id })+ </div>+ </div>+ </div>+ </div>++ <div class="col-12 px-0 my-3">+ <div>+ <gn-tabs content-class="mt-3" align="center">+ <gn-tab title="@Loc["Products.Description"]" active="true">+ @* v-pre: this content comes from the database and lands inside the #app template,+ so Vue would compile any {{ }} it contains - a stray brace in an editor's text+ threw at compile time and took the whole page down with it *@+ <div v-pre>+ @Html.Raw(Model.FullDescription)+ </div>+ </gn-tab>+ @if (Model.ProductTags.Any())+ {+ <gn-tab title="@Loc["Products.Tags"]">+ <partial name="Partials/ProductTags" model="Model.ProductTags"/>+ </gn-tab>+ }+ @if (Model.ProductSpecifications.Any())+ {+ <gn-tab title="@Loc["Products.Specs"]">+ <partial name="Partials/ProductSpecifications" model="Model.ProductSpecifications"/>+ </gn-tab>+ }+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <gn-tab id="review-tab" title="@Loc["Products.Reviews"]">+ @await Component.InvokeAsync("ProductReviews", new { productId = Model.Id })+ </gn-tab>+ }+ @if (Model.AskQuestionOnProduct)+ {+ <gn-tab title="@Loc["Products.ContactUs"]"+ on-click="@(Model.ProductAskQuestion.DisplayCaptcha ? "askquestion.getCaptcha()" : null)">+ <partial name="Partials/AskQuestionOnProduct" model="Model.ProductAskQuestion"/>+ </gn-tab>+ }+ </gn-tabs>+ </div>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_before_collateral", additionalData = Model.Id })+ <div class="product-collateral">+ <div>+ <!--associated products-->+ @foreach (var variant in Model.AssociatedProducts)+ {+ <form asp-route="Product" asp-route-sename="@Model.SeName" method="post" id=@($"product-details-form-{variant.Id}") ref="form" v-on:submit.prevent="formSubmitParam($event, vm.$refs.ProductFormObserver)">+ <di class="card overflow-hidden associatedItem mb-3">+ <div class="row g-0">+ <div class="col-lg-3 col-md-4">+ <img class="img-fluid rounded-0" id="[email protected]" alt="@variant.DefaultPictureModel.AlternateText" src="@variant.DefaultPictureModel.ImageUrl"/>+ </div>+ <div class="col-lg-9 col-md-8">+ <div class="card-body overview" title="@variant.Name">+ <div v-pre>+ @Html.Raw(variant.ShortDescription)+ </div>+ <!--availability-->+ <partial name="Partials/Availability" model="variant"/>+ <!--Code products - SKU, MAN, GTIN, Vendor info -->+ <partial name="Partials/Codes" model="variant"/>+ <!--delivery-->+ @if ((variant.FreeShippingNotificationEnabled && Model.IsFreeShipping) || !string.IsNullOrWhiteSpace(variant.DeliveryDate)+ || variant.NotReturnable || variant.AdditionalShippingCharge > 0)+ {+ <partial name="Partials/DeliveryInfo" model="variant"/>+ }+ <!--sample download-->+ @if (variant.HasSampleDownload)+ {+ <partial name="Partials/DownloadSample" model="variant"/>+ }+ <!--attributes-->+ @if (variant.ProductAttributes.Any())+ {+ <partial name="Partials/ProductAttributes" model="variant"/>+ }+ <!--gift voucher-->+ @if (variant.GiftVoucher.IsGiftVoucher)+ {+ <partial name="Partials/GiftVoucherInfo" model="variant.GiftVoucher"/>+ }+ <!--price breaks-->+ @if (variant.TierPrices.Any())+ {+ <partial name="Partials/TierPrices" model="variant.TierPrices"/>+ }++ <!--price & add to cart-->+ <partial name="Partials/Prices" model="variant.ProductPrice"/>+ <partial name="Partials/AddToCart" model="variant.AddToCart"/>+ <div class="mt-2">+ <partial name="Partials/AddToWishlist" model="variant.AddToCart"/>+ </div>+ </div>+ </div>+ </div>+ </di>+ </form>+ }++ @if (Model.AssociatedProducts.Count == 0)+ {+ <div class="no-associated-products">+ @Loc["Products.NoAssociatedProducts"]+ </div>+ }+ </div>+ </div>+ @if (Model.RenderCaptcha)+ {+ <partial name="Partials/Captcha"/>+ }+ </div>+ @await Component.InvokeAsync("RelatedProducts", new { productId = Model.Id })+ </validation-observer>+ @if (Model.EmailAFriendEnabled)+ {+ @await Component.InvokeAsync("ProductEmailAFriend", new { productId = Model.Id })+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "productdetails_bottom", additionalData = Model.Id })+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Product/ProductLayout.Simple.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Product/ProductLayout.Simple.cshtmlnew file mode 100644index 000000000..ef3f28956--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Product/ProductLayout.Simple.cshtml@@ -0,0 +1,255 @@+@model ProductDetailsModel+@inject SeoSettings seoSettings+@inject IPageHeadBuilder pagebuilder++@{+ Layout = "_SingleColumn";++ //title, meta+ pagebuilder.AddTitleParts(!string.IsNullOrEmpty(Model.MetaTitle) ? Model.MetaTitle : Model.Name);+ pagebuilder.AddMetaDescriptionParts(Model.MetaDescription);+ pagebuilder.AddMetaKeywordParts(Model.MetaKeywords);++ //canonical URL+ if (seoSettings.CanonicalUrlsEnabled)+ {+ var productUrl = Url.RouteUrl("Product", new { Model.SeName }, Url.ActionContext.HttpContext.Request.Scheme);+ pagebuilder.AddCanonicalUrlParts(productUrl);+ }+}++@section meta {+ @if (seoSettings.OpenGraphMetaTags)+ {+ <meta property=og:type content=product/>+ <meta property="og:title" content="@Html.Encode(Model.Name)"/>+ <meta property="og:description" content="@Html.Encode(Model.MetaDescription)"/>+ <meta property="og:image" content="@Model.DefaultPictureModel.ImageUrl"/>+ <meta property="og:image:url" content="@Model.DefaultPictureModel.ImageUrl"/>+ <meta property="og:url" content="@Url.ActionContext.HttpContext.Request.GetEncodedUrl()"/>+ <meta property="og:site_name" content="@Html.Encode(Model.CurrentStoreName)"/>+ }++ @if (seoSettings.TwitterMetaTags)+ {+ <meta property="twitter:card" content="summary"/>+ <meta property="twitter:site" content="@Html.Encode(Model.CurrentStoreName)"/>+ <meta property="twitter:title" content="@Html.Encode(Model.Name)"/>+ <meta property="twitter:description" content="@Html.Encode(Model.MetaDescription)"/>+ <meta property="twitter:image" content="@Model.DefaultPictureModel.ImageUrl"/>+ <meta property="twitter:url" content="@Url.ActionContext.HttpContext.Request.GetEncodedUrl()"/>+ }++ @*Product JSON-LD - not gated on the Open Graph settings, which are about social+ previews; this is what search engines read for rich results*@+ <partial name="Partials/ProductStructuredData" model="Model"/>+}++<!--product breadcrumb-->++@section Breadcrumb+{+ <partial name="Partials/Breadcrumbs" model="Model.Breadcrumb"/>+}++<vc:widget widget-zone="productdetails_after_breadcrumb" additional-data="@Model.Id"></vc:widget>+<div class="page product-details-page product-standard nordic-pd" vue-island="productreviews productreviewsoverview">+ <vc:widget widget-zone="productdetails_top" additional-data="@Model.Id"></vc:widget>+ <validation-observer ref="ProductFormObserver">+ <form asp-route="Product" asp-route-sename="@Model.SeName" method="post" id=@($"product-details-form-{Model.Id}") ref="form" v-on:submit.prevent="formSubmitParam($event, vm.$refs.ProductFormObserver)">+ <div itemscope itemtype="https://schema.org/Product" data-productid="@Model.Id">+ <div class="container position-relative">+ <div class="row nordic-pd__main">+ <vc:widget widget-zone="productdetails_before_pictures" additional-data="@Model.Id"></vc:widget>+ <!--product pictures-->+ <partial name="Partials/Pictures" model="Model"/>+ <vc:widget widget-zone="productdetails_after_pictures" additional-data="@Model.Id"></vc:widget>+ @*Nordic: the info column in editorial order - brand, title, rating and codes,+ price, delivery notes, short description, choices, buy row, then a perks list*@+ <div class="col-12 overview nordic-pd__info">+ @if (!string.IsNullOrEmpty(Model.Flag))+ {+ <div class="product-label">+ <div class="badge text-bg-info">@Model.Flag</div>+ </div>+ }+ <partial name="Partials/Unavailable" model="Model"/>+ @if (!string.IsNullOrEmpty(Model.BrandModel?.Name))+ {+ <div class="nordic-pd__brand">+ <a href="@Url.RouteUrl("Brand", new { Model.BrandModel.SeName })">@Model.BrandModel.Name</a>+ </div>+ }+ <h1 class="generalTitle nordic-pd__title" itemprop="name">+ @Model.Name+ </h1>+ <div class="nordic-pd__meta">+ <!--product reviews-->+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <partial name="Partials/ProductReviewOverview" model="Model.ProductReviewOverview"/>+ }+ <!--Code products - SKU, MAN, GTIN, Vendor info -->+ <partial name="Partials/Codes" model="Model"/>+ </div>+ <vc:widget widget-zone="productdetails_overview_top" additional-data="@Model.Id"></vc:widget>+ <!--price-->+ <div class="overview-buttons generalMarginSupporter nordic-pd__price">+ @if (Model.TierPrices.Any())+ {+ <div class="col-lg-12 px-0">+ <partial name="Partials/TierPrices" model="Model.TierPrices"/>+ </div>+ }+ <div class="col-lg-12 px-0">+ @{+ <partial name="Partials/Prices" model="Model.ProductPrice"/>+ }+ </div>+ </div>+ <!--delivery-->+ @if ((Model.FreeShippingNotificationEnabled && Model.IsFreeShipping) || !string.IsNullOrWhiteSpace(Model.DeliveryDate)+ || Model.NotReturnable || Model.AdditionalShippingCharge > 0)+ {+ <div class="nordic-pd__notes">+ <partial name="Partials/DeliveryInfo" model="Model"/>+ </div>+ }+ @if (!string.IsNullOrEmpty(Model.ShortDescription))+ {+ <div class="short-description generalMarginSupporter" v-pre>+ @Html.Raw(Model.ShortDescription)+ </div>+ }+ <!--collections-->+ @if (Model.ProductCollections.Any())+ {+ <partial name="Partials/Collections" model="Model.ProductCollections"/>+ }+ <!--product bundles-->+ @if (Model.ProductBundleModels.Any())+ {+ <partial name="Partials/ProductBundles" model="Model"/>+ }+ <!--attributes-->+ @if (Model.ProductAttributes.Any())+ {+ <partial name="Partials/ProductAttributes" model="Model"/>+ }+ <!--warehouses-->+ @if (Model.AllowToSelectWarehouse)+ {+ <partial name="Partials/Warehouses" model="Model"/>+ }+ <!--gift voucher-->+ @if (Model.GiftVoucher.IsGiftVoucher)+ {+ <partial name="Partials/GiftVoucherInfo" model="Model"/>+ }+ <!--reservation info-->+ @if (Model.ProductType == ProductType.Reservation)+ {+ <partial name="Partials/ReservationInfo" model="Model"/>+ }+ <!--add to cart-->+ <div class="generalMarginSupporter nordic-pd__buy">+ <!--auction-->+ @if (Model.ProductType == ProductType.Auction)+ {+ <partial name="Partials/AuctionInfo" model="Model"/>+ }+ <partial name="Partials/AddToCart" model="Model.AddToCart"/>+ </div>+ <!--perks: availability, sample, wishlist, compare, e-mail a friend-->+ <div class="nordic-perks">+ @if (!string.IsNullOrWhiteSpace(Model.StockAvailability) || Model.DisplayOutOfStockSubscription)+ {+ <div class="nordic-perk nordic-perk--stock">+ <partial name="Partials/Availability" model="Model"/>+ </div>+ }+ @if (Model.HasSampleDownload)+ {+ <div class="nordic-perk">+ <partial name="Partials/DownloadSample" model="Model"/>+ </div>+ }+ <div class="btn-group nordic-perk nordic-perk--actions">+ @if (Model.ProductType is ProductType.SimpleProduct or ProductType.BundledProduct)+ {+ <partial name="Partials/AddToWishlist" model="Model.AddToCart"/>+ <partial name="Partials/ProductsComparison" model="Model"/>+ }+ @if (Model.EmailAFriendEnabled)+ {+ <partial name="Partials/SendFriend" model="Model"/>+ }+ </div>+ </div>+ @if (!string.IsNullOrWhiteSpace(Model.PageShareCode))+ {+ <div class="col-12 product-share px-0">+ <partial name="Partials/ShareButton" model="Model"/>+ </div>+ }+ <vc:widget widget-zone="productdetails_overview_bottom" additional-data="@Model.Id"></vc:widget>+ </div>+ </div>+ </div>++ <div class="col-12 px-0 my-3">+ <div>+ <gn-tabs content-class="mt-3" align="center">+ <gn-tab title="@Loc["Products.Description"]" active="true">+ @* v-pre: this content comes from the database and lands inside the #app template,+ so Vue would compile any {{ }} it contains - a stray brace in an editor's text+ threw at compile time and took the whole page down with it *@+ <div v-pre>+ @Html.Raw(Model.FullDescription)+ </div>+ </gn-tab>+ @if (Model.ProductTags.Any())+ {+ <gn-tab title="@Loc["Products.Tags"]">+ <partial name="Partials/ProductTags" model="Model.ProductTags"/>+ </gn-tab>+ }+ @if (Model.ProductSpecifications.Any())+ {+ <gn-tab title="@Loc["Products.Specs"]">+ <partial name="Partials/ProductSpecifications" model="Model.ProductSpecifications"/>+ </gn-tab>+ }+ @if (Model.ProductReviewOverview.AllowCustomerReviews)+ {+ <gn-tab id="review-tab" title="@Loc["Products.Reviews"]">+ @await Component.InvokeAsync("ProductReviews", new { productId = Model.Id })+ </gn-tab>+ }+ @if (Model.AskQuestionOnProduct)+ {+ <gn-tab title="@Loc["Products.ContactUs"]"+ on-click="@(Model.ProductAskQuestion.DisplayCaptcha ? "askquestion.getCaptcha()" : null)">+ <partial name="Partials/AskQuestionOnProduct" model="Model.ProductAskQuestion"/>+ </gn-tab>+ }+ </gn-tabs>+ </div>+ </div>+ <vc:products-also-purchased product-id="@Model.Id" product-thumb-picture-size="null"></vc:products-also-purchased>+ <vc:related-products product-id="@Model.Id" product-thumb-picture-size="null"></vc:related-products>+ <vc:similar-products product-id="@Model.Id" product-thumb-picture-size="null"></vc:similar-products>+ <vc:recommended-products product-id="@Model.Id" product-thumb-picture-size="null"></vc:recommended-products>+ @if (Model.RenderCaptcha)+ {+ <partial name="Partials/Captcha"/>+ }+ </div>+ </form>+ </validation-observer>+ @if (Model.EmailAFriendEnabled)+ {+ @await Component.InvokeAsync("ProductEmailAFriend", new { productId = Model.Id })+ }+ <vc:widget widget-zone="productdetails_bottom" additional-data="@Model.Id"></vc:widget>+</div>\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/Footer/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/Footer/Default.cshtmlnew file mode 100644index 000000000..b21ce3993--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/Footer/Default.cshtml@@ -0,0 +1,179 @@+@model FooterModel++<partial name="Partials/NewsletterBox"/>++<footer class="nordic-footer" vue-island>+ <div class="container">+ <div class="nordic-footer__grid">+ <div class="nordic-footer__brand">+ <a class="nordic-wordmark" href="@Url.RouteUrl("HomePage")">@Model.StoreName</a>+ <ol class="list-group social-icons list-pad">+ @if (!string.IsNullOrEmpty(Model.FacebookLink))+ {+ <li class="list-group-item facebook">+ <a title="facebook" href="@Model.FacebookLink" rel="noopener" target="_blank">+ <img height="32" width="32" src="/theme/images/facebook.svg" alt="facebook"/>+ <span class="visually-hidden">Facebook</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.TwitterLink))+ {+ <li class="list-group-item twitter">+ <a title="twitter" href="@Model.TwitterLink" rel="noopener" target="_blank">+ <img height="32" width="32" src="/theme/images/twitter.svg" alt="twitter"/>+ <span class="visually-hidden">twitter</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.YoutubeLink))+ {+ <li class="list-group-item youtube">+ <a title="youtube" href="@Model.YoutubeLink" rel="noopener" target="_blank">+ <img height="32" width="32" src="/theme/images/youtube.svg" alt="youtube"/>+ <span class="visually-hidden">youtube</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.InstagramLink))+ {+ <li class="list-group-item instagram">+ <a href="@Model.InstagramLink" rel="noopener" target="_blank">+ <img height="32" width="32" src="/theme/images/instagram.svg" alt="instagram"/>+ <span class="visually-hidden">instagram</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.LinkedInLink))+ {+ <li class="list-group-item linkedin">+ <a href="@Model.LinkedInLink" rel="noopener" target="_blank">+ <img height="32" width="32" src="/theme/images/linkedin.svg" alt="linkedin"/>+ <span class="visually-hidden">linkedin</span>+ </a>+ </li>+ }+ @if (!string.IsNullOrEmpty(Model.PinterestLink))+ {+ <li class="list-group-item pinterest">+ <a href="@Model.PinterestLink" rel="noopener" target="_blank">+ <img height="32" width="32" src="/theme/images/pinterest.svg" alt="pinterest"/>+ <span class="visually-hidden">pinterest</span>+ </a>+ </li>+ }+ </ol>+ </div>+ <div id="footer-block-information" class="footer-block information block">+ <h2 class="nordic-footer__head">@Loc["Footer.Information"]</h2>+ <div class="viewBox">+ <div class="list-group">+ @if (Model.SitemapEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Sitemap")">@Loc["Sitemap"]</a>+ }+ @if (Model.PrivacyPreference)+ {+ <a class="list-group-item list-group-item-action btn btn-link" id="btnPrivacyPreference" @@click="getPrivacyPreference('@Url.RouteUrl("PrivacyPreference")'); return false;">@Loc["PrivacyPreference"]</a>+ }+ @foreach (var mpage in Model.Pages.Where(x => x.IncludeInFooterRow1).ToList())+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Page", new { mpage.SeName })">@mpage.Name</a>+ }+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("ContactUs")">@Loc["ContactUs"]</a>+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("ProductSearch")">@Loc["Search"]</a>+ @if (Model.NewsEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("NewsArchive")">@Loc["News"]</a>+ }+ @if (Model.BlogEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Blog")">@Loc["Blog"]</a>+ }+ @if (Model.KnowledgebaseEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Knowledgebase")">@Loc["Knowledgebase"]</a>+ }+ @if (Model.RecentlyViewedProductsEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("RecentlyViewedProducts")">@Loc["Products.RecentlyViewedProducts"]</a>+ }+ @if (Model.NewProductsEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("NewProducts")">@Loc["Products.NewProducts"]</a>+ }+ </div>+ </div>+ </div>+ <div id="footer-block-my-account" class="footer-block my-account block">+ <h2 class="nordic-footer__head">@Loc["Footer.MyAccount"]</h2>+ <div class="viewBox">+ <div class="list-group list-pad">+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("CustomerInfo")">@Loc["Account.MyAccount"]</a>+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("CustomerOrders")">@Loc["Account.CustomerOrders"]</a>+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("CustomerAddresses")">@Loc["Account.CustomerAddresses"]</a>+ @if (Model.ShoppingCartEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("ShoppingCart")">@Loc["ShoppingCart"]</a>+ }+ @if (Model.WishlistEnabled)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Wishlist")">@Loc["Wishlist"]</a>+ }+ @if (Model.AllowCustomersToApplyForVendorAccount)+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("ApplyVendorAccount")">@Loc["Vendors.ApplyAccount"]</a>+ }+ @foreach (var mpage in Model.Pages.Where(x => x.IncludeInFooterRow2).ToList())+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Page", new { mpage.SeName })" target="_blank">@mpage.Name</a>+ }+ </div>+ </div>+ </div>+ <div id="footer-block-about-us" class="footer-block about-us block">+ <h2 class="nordic-footer__head">@Loc["Footer.AboutUs"]</h2>+ <div class="viewBox">+ <div class="list-group list-pad">+ @foreach (var mpage in Model.Pages.Where(x => x.IncludeInFooterRow3).ToList())+ {+ <a class="list-group-item list-group-item-action" href="@Url.RouteUrl("Page", new { mpage.SeName })">@mpage.Name</a>+ }+ </div>+ </div>+ <dl class="nordic-footer__company">+ @if (!string.IsNullOrEmpty(Model.CompanyName))+ {+ <dt>@Loc["Footer.CompanyName.Title"]</dt>+ <dd>@Model.CompanyName</dd>+ }+ @if (!string.IsNullOrEmpty(Model.CompanyAddress))+ {+ <dt>@Loc["Footer.Address.Title"]</dt>+ <dd>@Model.CompanyAddress</dd>+ }+ @if (!string.IsNullOrEmpty(Model.CompanyEmail))+ {+ <dt>@Loc["footer.Email.Title"]</dt>+ <dd>@Model.CompanyEmail</dd>+ }+ @if (!string.IsNullOrEmpty(Model.CompanyPhone))+ {+ <dt>@Loc["Footer.Phone.Title"]</dt>+ <dd>@Model.CompanyPhone</dd>+ }+ @if (!string.IsNullOrEmpty(Model.CompanyHours))+ {+ <dt>@Loc["Footer.Hour.Title"]</dt>+ <dd>@Model.CompanyHours</dd>+ }+ </dl>+ </div>+ </div>+ <div class="footer-lower nordic-footer__lower">+ <span class="footer-disclaimer copyright">@Html.Raw(Loc["Content.CopyrightNotice", DateTime.Now.Year, Model.StoreName])</span>+ <span><span>Shopping cart software by </span><a class="pe-1" href="https://grandnode.com/">GrandNode</a>™</span>+ </div>+ </div>+ @await Component.InvokeAsync("Widget", new { widgetZone = "footer" })+</footer>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageBlog/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageBlog/Default.cshtmlnew file mode 100644index 000000000..2a91d96d2--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageBlog/Default.cshtml@@ -0,0 +1,37 @@+@model HomePageBlogItemsModel+@inject DisplayOrderHomePage order+@if (Model.Items.Any())+{+ <section class="blog-list-homepage nordic-section nordic-journal [email protected]">+ <div class="nordic-section-head">+ <h2 class="nordic-section-title">@Loc["Blog.Latest"]</h2>+ <a class="nordic-section-link" href="@Url.RouteUrl("Blog")">@Loc["Blog.ViewAll"] <span aria-hidden="true">→</span></a>+ </div>+ <div class="nordic-journal__grid">+ @foreach (var item in Model.Items)+ {+ <article class="nordic-post">+ @if (item.PictureModel != null && !string.IsNullOrEmpty(item.PictureModel.ImageUrl))+ {+ <a class="nordic-post__media" href="@Url.RouteUrl("BlogPost", new { item.SeName })" tabindex="-1" aria-hidden="true">+ <img src="@item.PictureModel.ImageUrl" alt="@item.PictureModel.AlternateText" loading="lazy">+ </a>+ }+ <div class="nordic-kicker">+ @if (!string.IsNullOrEmpty(item.Category))+ {+ <span>@item.Category</span><span aria-hidden="true"> · </span>+ }+ <span>@item.CreatedOn.ToString("D")</span>+ </div>+ <h3 class="nordic-post__title">+ <a href="@Url.RouteUrl("BlogPost", new { item.SeName })">@item.Title</a>+ </h3>+ <div class="nordic-post__short" v-pre>+ @Html.Raw(item.Short)+ </div>+ </article>+ }+ </div>+ </section>+}diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageBrands/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageBrands/Default.cshtmlnew file mode 100644index 000000000..07b795f95--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageBrands/Default.cshtml@@ -0,0 +1,22 @@+@model IList<BrandModel>+@inject DisplayOrderHomePage order+<section class="categoryGrid nordic-section nordic-brands [email protected]">+ <div class="nordic-section-head">+ <h2 class="nordic-section-title">@Loc["Brands"]</h2>+ <a class="nordic-section-link" href="@Url.RouteUrl("BrandList")">@Loc["Brands.List"] <span aria-hidden="true">→</span></a>+ </div>+ <ul class="nordic-brands__strip">+ @foreach (var item in Model)+ {+ <li>+ <a class="nordic-brands__link" href="@Url.RouteUrl("Brand", new { item.SeName })" title="@item.PictureModel.Title">+ @if (!string.IsNullOrEmpty(item.PictureModel.ImageUrl))+ {+ <img class="nordic-brands__pic" src="@item.PictureModel.ImageUrl" alt="" loading="lazy">+ }+ <span>@item.Name</span>+ </a>+ </li>+ }+ </ul>+</section>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageCategories/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageCategories/Default.cshtmlnew file mode 100644index 000000000..749090040--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageCategories/Default.cshtml@@ -0,0 +1,22 @@+@model IList<CategoryModel>+@inject DisplayOrderHomePage order+@{+ @* Nordic: 5 tiles make a mosaic, 3 or 6 even rows of three, anything else an even grid *@+ var countClass = Model.Count switch { 5 => "5", 3 => "3", 6 => "6", _ => "n" };+}+<section class="categoryGrid nordic-section nordic-cats nordic-cats--@countClass [email protected]">+ <div class="nordic-section-head">+ <h2 class="nordic-section-title">@Loc["Categories"]</h2>+ </div>+ <div class="nordic-cats__grid">+ @foreach (var item in Model)+ {+ <div class="nordic-tile">+ <a class="nordic-tile__link" href="@Url.RouteUrl("Category", new { item.SeName })" title="@item.PictureModel.Title">+ <img src="@item.PictureModel.ImageUrl" alt="@item.PictureModel.AlternateText" loading="lazy"/>+ <h3 class="nordic-tile__name">@item.Name</h3>+ </a>+ </div>+ }+ </div>+</section>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageCollections/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageCollections/Default.cshtmlnew file mode 100644index 000000000..73706ea2c--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageCollections/Default.cshtml@@ -0,0 +1,36 @@+@using System.Net+@using System.Text.RegularExpressions+@model IList<CollectionModel>+@inject DisplayOrderHomePage order+<section class="categoryGrid nordic-section nordic-colls [email protected] [email protected]">+ <div class="nordic-section-head">+ <h2 class="nordic-section-title">@Loc["Collections"]</h2>+ <a class="nordic-section-link" href="@Url.RouteUrl("CollectionList")">@Loc["Collections.List"] <span aria-hidden="true">→</span></a>+ </div>+ <div class="nordic-colls__grid">+ @foreach (var item in Model)+ {+ @* the description is editor HTML; the banner shows it as a line of plain text *@+ var text = Regex.Replace(WebUtility.HtmlDecode(Regex.Replace(item.Description ?? "", "<[^>]+>", " ")), @"\s+", " ").Trim();+ if (text.Length > 160)+ {+ text = text[..160].TrimEnd() + "…";+ }+ <article class="nordic-coll">+ <a class="nordic-coll__media" href="@Url.RouteUrl("Collection", new { item.SeName })" tabindex="-1" aria-hidden="true">+ <img src="@item.PictureModel.ImageUrl" alt="@item.PictureModel.AlternateText" loading="lazy">+ </a>+ <div class="nordic-coll__text">+ <h3 class="nordic-coll__name">+ <a href="@Url.RouteUrl("Collection", new { item.SeName })" title="@item.PictureModel.Title">@item.Name</a>+ </h3>+ @if (!string.IsNullOrEmpty(text))+ {+ <p class="nordic-coll__desc">@text</p>+ }+ <a class="btn btn-outline-secondary nordic-coll__cta" href="@Url.RouteUrl("Collection", new { item.SeName })">@Loc["Mobile.Category.Show"]<span class="visually-hidden"> @item.Name</span></a>+ </div>+ </article>+ }+ </div>+</section>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageNews/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageNews/Default.cshtmlnew file mode 100644index 000000000..8dd6de4e4--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageNews/Default.cshtml@@ -0,0 +1,19 @@+@model HomePageNewsItemsModel+@inject DisplayOrderHomePage order+<section class="news-list-homepage nordic-section nordic-news [email protected]">+ <div class="nordic-section-head">+ <h2 class="nordic-section-title">@Loc["News"]</h2>+ <a class="nordic-section-link" href="@Url.RouteUrl("NewsArchive")">@Loc["News.ViewAll"] <span aria-hidden="true">→</span></a>+ </div>+ <ul class="nordic-news__strip">+ @foreach (var item in Model.NewsItems)+ {+ <li class="nordic-news__item">+ <small class="nordic-kicker">@item.CreatedOn.ToString("D")</small>+ <h3 class="nordic-news__title">+ <a href="@Url.RouteUrl("NewsItem", new { item.SeName })">@item.Title</a>+ </h3>+ </li>+ }+ </ul>+</section>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageProducts/Default.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageProducts/Default.cshtmlnew file mode 100644index 000000000..c9e784f8a--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Components/HomePageProducts/Default.cshtml@@ -0,0 +1,15 @@+@model IList<ProductOverviewModel>+@inject DisplayOrderHomePage order+<section class="product-grid nordic-section nordic-products [email protected]" vue-island>+ <div class="nordic-section-head">+ <h2 class="nordic-section-title">@Loc["HomePage.Products"]</h2>+ </div>+ <div class="row nordic-products__grid">+ @foreach (var item in Model)+ {+ <div class="col-lg-3 col-md-4 col-6 product-container mb-2">+ <partial name="Partials/CatalogProductView" model="item"/>+ </div>+ }+ </div>+</section>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/CatalogProductListView.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/CatalogProductListView.cshtmlnew file mode 100644index 000000000..8b1a405df--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/CatalogProductListView.cshtml@@ -0,0 +1,286 @@+@*+ Server-rendered product row for the "list" view mode of the catalog listings.+ Counterpart of Views/Nordic/Catalog/Partials/Client/CatalogProductListView.cshtml, which+ draws the same row from catalog.Model after a client-side sort/filter/page.++ The grid-mode counterpart is Partials/CatalogProductView.cshtml; the row carries the+ same elements laid out horizontally.+*@+@using System.Globalization+@model ProductOverviewModel+@{+ @* Nordic: one badge, in this priority. Client twin: Catalog/Partials/Client/CatalogProductGridView *@+ var onSale = !string.IsNullOrEmpty(Model.ProductPrice.OldPrice);+ string badge = null, badgeClass = null;+ if (Model.ProductType == ProductType.Auction) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.Auction"); badgeClass = "auction"; }+ else if (onSale) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.Sale"); badgeClass = "sale"; }+ else if (Model.ProductType == ProductType.BundledProduct) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.Bundle"); badgeClass = "bundle"; }+ else if (Model.MarkAsNew) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.New"); badgeClass = "new"; }+}++@await Component.InvokeAsync("Widget", new { widgetZone = "productbox_before_content", additionalData = Model })+<div class="w-100 mb-3 border-bottom nordic-list-row">+<article v-bind:class="{ mobile: isMobile()}" class="card product-box list nordic-card nordic-card--list mb-3">+ <div class="picture-container nordic-card__media">+ <a class="img-container" href="@Url.RouteUrl("Product", new { Model.SeName })" title="@Model.DefaultPictureModel.Title">+ <img class="card-img main-product-img" src="@Model.DefaultPictureModel.ImageUrl" alt="@Model.DefaultPictureModel.AlternateText" loading="lazy" title="@Model.DefaultPictureModel.Title">+ @if (!string.IsNullOrEmpty(Model.SecondPictureModel.ImageUrl))+ {+ <img class="card-img hover-img" src="@Model.SecondPictureModel.ImageUrl" alt="@Model.SecondPictureModel.AlternateText" loading="lazy">+ }+ </a>+ <div class="nordic-card__badges">+ @if (badge != null)+ {+ <span class="nordic-badge nordic-badge--@badgeClass">@badge</span>+ }+ @if (!string.IsNullOrEmpty(Model.Flag))+ {+ <div class="product-label">+ <div class="badge text-bg-info">@Model.Flag</div>+ </div>+ }+ </div>+ <a title="@Loc["Products.QuickView"]" class="btn btn-secondary quick-view-button" data-bs-target="ModalQuickView" data-cart-action="quickview" data-url="@Model.QuickViewUrl">+ <i class="b-icon bi bi-search" aria-hidden="true"></i>+ <span>@Loc["Products.QuickView"]</span>+ </a>+ </div>+ <div class="card-body nordic-card__body">+ @if (!string.IsNullOrEmpty(Model.BrandName))+ {+ <div class="nordic-card__brand">@Model.BrandName</div>+ }+ <h3 class="card-title nordic-card__name mb-0">+ <a href="@Url.RouteUrl("Product", new { Model.SeName })">@Model.Name</a>+ </h3>+ @if (Model.ShowSku && !string.IsNullOrEmpty(Model.Sku))+ {+ <span class="sku">@Model.Sku</span>+ }+ <div class="prices-rating">+ <div class="prices nordic-card__price @(onSale ? "is-sale" : "") @if (Model.ProductType == ProductType.Reservation) { <text>reservation-price</text> }">+ @if (Model.ProductType != ProductType.Auction)+ {+ <div class="actual-price price">+ @Model.ProductPrice.Price+ @if (Model.ProductPrice.CallForPrice)+ {+ @Loc["Products.CallForPrice"]+ }+ </div>+ }+ else+ {+ <div class="actual-price price">+ @(Model.ProductPrice.HighestBidValue > 0 ? Model.ProductPrice.HighestBid : Model.ProductPrice.StartPrice)+ </div>+ }+ @if (onSale)+ {+ <div class="old-price price">+ @Model.ProductPrice.OldPrice+ </div>+ }+ </div>+ @if (Model.ProductType == ProductType.Auction)+ {+ @if (Model.EndTime.HasValue)+ {+ <div class="countdown-box nordic-card__countdown">+ @if (Model.EndTime > DateTime.UtcNow)+ {+ <countdown :end-time="@Model.EndTime.Value.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>+ <span>{{ `${timeObj.d}` }}@Loc["Countdown.Days"]</span>+ <span>{{ `${timeObj.h}` }}@Loc["Countdown.Hours"]</span>+ <span>{{ `${timeObj.m}` }}@Loc["Countdown.Minutes"]</span>+ <span>{{ `${timeObj.s}` }}@Loc["Countdown.Seconds"]</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ }+ else+ {+ <div class="d-inline-flex flex-wrap">+ <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label>+ <div class="count-date">@Model.EndTimeLocalTime.Value.ToString(CultureInfo.InvariantCulture)</div>+ </div>+ }+ </div>+ }+ }+ @if (Model.ReviewOverviewModel.AllowCustomerReviews)+ {+ <div class="rating">+ <partial name="Partials/Rating" model="Model.ReviewOverviewModel.AvgRating" />+ <a href="@Url.RouteUrl("Product", new { Model.SeName })">@Model.ReviewOverviewModel.TotalReviews @Loc["Reviews.Overview.Reviews"]</a>+ </div>+ }+ </div>+ </div>+ <div class="card-footer nordic-card__footer">+ @if (Model.SpecificationAttributeModels.Any())+ {+ <div class="spec-container">+ @{+ var group = Model.SpecificationAttributeModels.GroupBy(x => x.SpecificationAttributeName);+ }+ <table>+ <tbody>+ @foreach (var item in group)+ {+ <tr class="attr">+ <td>+ <div class="spec-name">+ @{+ var groupList = item.ToList();+ }+ @groupList[0].SpecificationAttributeName:+ </div>+ </td>+ <td>+ <div class="spec-value">+ @foreach (var spec in groupList)+ {+ <span>+ @Html.Raw(spec.ValueRaw)+ </span>+ }+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ @if (Model.ProductAttributeModels.Any())+ {+ <div class="attr-container">+ <table>+ <tbody>+ @foreach (var item in Model.ProductAttributeModels)+ {+ <tr class="attr @(item.AttributeControlType == AttributeControlType.ColorSquares ? "attr--color" : "")">+ <td>+ <div class="attr-name">+ @item.Name+ </div>+ </td>+ <td>+ <div class="attr-value">+ @foreach (var spec in item.Values)+ {+ // fully qualified: Grand.Web.Common.Extensions has a CommonExtensions too+ var valueUrl = Grand.Infrastructure.Extensions.CommonExtensions.ModifyQueryString(+ Url.RouteUrl("Product", new { Model.SeName }), item.Name, spec.Name);+ switch (item.AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ case AttributeControlType.RadioList:+ case AttributeControlType.Checkboxes:+ case AttributeControlType.ReadonlyCheckboxes:+ <a class="btn btn-sm btn-light name" href="@valueUrl">@spec.Name</a>+ break;+ case AttributeControlType.ColorSquares:+ if (spec.PictureModel.FullSizeImageUrl != null)+ {+ <a class="btn btn-sm btn-light name color-container" title="@spec.Name" @@click="productImage($event)" data-href="@spec.PictureModel.FullSizeImageUrl">+ <span class="color" style="background-color:@spec.ColorSquaresRgb;"> </span>+ </a>+ }+ else+ {+ <a class="btn btn-sm btn-light name color-container" title="@spec.Name" href="@valueUrl">+ <span class="color" style="background-color:@spec.ColorSquaresRgb;"> </span>+ </a>+ }++ break;+ case AttributeControlType.ImageSquares:+ if (spec.PictureModel.FullSizeImageUrl != null)+ {+ <a class="btn btn-sm btn-light p-1 name image-container" v-on:click='productImage' data-href="@spec.PictureModel.FullSizeImageUrl">+ <img src="@spec.ImageSquaresPictureModel?.ImageUrl" alt="@spec.Name"/>+ </a>+ }+ else+ {+ <a class="btn btn-sm btn-light p-1 name image-container" href="@valueUrl">+ <img src="@spec.ImageSquaresPictureModel?.ImageUrl" alt="@spec.Name"/>+ </a>+ }++ break;+ }+ }+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ <div class="desc" v-pre>+ @Html.Raw(Model.ShortDescription)+ </div>+ @if (Model.ShowQty)+ {+ var qtyId = "addtocart_" + Model.Id + "_EnteredQuantity";+ <input class="form-control input-group-addon catalog-quantity" type="number" min="1" id="@qtyId" name="@qtyId" value="1">+ }+ <div class="btn-group nordic-card__actions">+ @if (!Model.ProductPrice.DisableBuyButton)+ {+ var addToCartText = Loc["ShoppingCart.AddToCart"];+ if (Model.ProductType == ProductType.Reservation)+ {+ addToCartText = Loc["ShoppingCart.Reservation"];+ }++ if (Model.ProductPrice.AvailableForPreOrder)+ {+ addToCartText = Loc["ShoppingCart.PreOrder"];+ }++ <button class="btn btn-info nordic-card__cart" data-cart-action="add" data-url="@Model.AddToCartUrl" data-show-qty="@Model.ShowQty" data-product-id="@Model.Id">+ <i class="b-icon bi bi-bag" aria-hidden="true"></i>+ <span class="add-cart-text">@(addToCartText)</span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ }+ else+ {+ if (Model.ProductType == ProductType.Auction)+ {+ var addToCartText = Loc["ShoppingCart.Bids"];+ <button class="btn btn-info nordic-card__cart" data-cart-action="add" data-url="@Model.AddToCartUrl" data-show-qty="false" data-product-id="@Model.Id">+ <i class="b-icon bi bi-hammer" aria-hidden="true"></i>+ <span class="add-cart-text">@(addToCartText)</span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ }+ }+ @if (!Model.ProductPrice.DisableWishlistButton && Model.ProductType == ProductType.SimpleProduct)+ {+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-secondary nordic-card__icon" data-cart-action="add" data-url="@Model.AddToWishlistUrl" data-show-qty="@Model.ShowQty" data-product-id="@Model.Id">+ <i class="b-icon bi bi-heart" aria-hidden="true"></i>+ <span class="visually-hidden">AddToWishlist</span>+ </button>+ }+ @if (!Model.ProductPrice.DisableAddToCompareListButton && Model.ProductType == ProductType.SimpleProduct)+ {+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-secondary nordic-card__icon" data-cart-action="compare" data-product-id="@Model.Id">+ <span class="visually-hidden">AddToCompareList</span>+ <i class="b-icon bi bi-shuffle" aria-hidden="true"></i>+ </button>+ }+ </div>+ </div>+</article>+</div>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/CatalogProductView.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/CatalogProductView.cshtmlnew file mode 100644index 000000000..cd90d5a40--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/CatalogProductView.cshtml@@ -0,0 +1,283 @@+@using System.Globalization+@model ProductOverviewModel+@{+ @*+ Cards above the fold opt out of lazy loading: the browser only discovers a+ lazy image after layout, which on a category page delays the very image that+ decides LCP. The caller sets this for the first row; everything else stays+ lazy, which is the right default further down the page.+ *@+ var eagerImage = ViewData["EagerImage"] as bool? ?? false;++ @* Nordic: one badge, in this priority. Client twin: Catalog/Partials/Client/CatalogProductGridView *@+ var onSale = !string.IsNullOrEmpty(Model.ProductPrice.OldPrice);+ string badge = null, badgeClass = null;+ if (Model.ProductType == ProductType.Auction) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.Auction"); badgeClass = "auction"; }+ else if (onSale) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.Sale"); badgeClass = "sale"; }+ else if (Model.ProductType == ProductType.BundledProduct) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.Bundle"); badgeClass = "bundle"; }+ else if (Model.MarkAsNew) { badge = NordicText.Get(Loc, "Theme.Nordic.Badge.New"); badgeClass = "new"; }+}++@await Component.InvokeAsync("Widget", new { widgetZone = "productbox_before_content", additionalData = Model })+<article v-bind:class="{ mobile: isMobile()}" class="card product-box nordic-card mb-2">+ <div class="picture-container nordic-card__media">+ <a class="img-container" href="@Url.RouteUrl("Product", new { Model.SeName })" title="@Model.DefaultPictureModel.Title">+ <img class="card-img main-product-img" src="@Model.DefaultPictureModel.ImageUrl" alt="@Model.DefaultPictureModel.AlternateText" loading="@(eagerImage ? "eager" : "lazy")" fetchpriority="@(eagerImage ? "high" : "auto")" title="@Model.DefaultPictureModel.Title">+ @if (!string.IsNullOrEmpty(Model.SecondPictureModel.ImageUrl))+ {+ <img class="card-img hover-img" src="@Model.SecondPictureModel.ImageUrl" alt="@Model.SecondPictureModel.AlternateText" loading="lazy">+ }+ </a>+ <div class="nordic-card__badges">+ @if (badge != null)+ {+ <span class="nordic-badge nordic-badge--@badgeClass">@badge</span>+ }+ @if (!string.IsNullOrEmpty(Model.Flag))+ {+ <div class="product-label">+ <div class="badge text-bg-info">@Model.Flag</div>+ </div>+ }+ </div>+ <a title="@Loc["Products.QuickView"]" class="btn btn-secondary quick-view-button" data-bs-target="ModalQuickView" data-cart-action="quickview" data-url="@Model.QuickViewUrl">+ <i class="b-icon bi bi-search" aria-hidden="true"></i>+ <span>@Loc["Products.QuickView"]</span>+ </a>+ </div>+ <div class="card-body nordic-card__body">+ @if (!string.IsNullOrEmpty(Model.BrandName))+ {+ <div class="nordic-card__brand">@Model.BrandName</div>+ }+ <h3 class="card-title nordic-card__name mb-0">+ <a href="@Url.RouteUrl("Product", new { Model.SeName })">@Model.Name</a>+ </h3>+ @if (Model.ShowSku && !string.IsNullOrEmpty(Model.Sku))+ {+ <span class="sku">@Model.Sku</span>+ }+ <div class="prices-rating">+ <div class="prices nordic-card__price @(onSale ? "is-sale" : "") @if (Model.ProductType == ProductType.Reservation) { <text>reservation-price</text> }">+ @if (Model.ProductType != ProductType.Auction)+ {+ <div class="actual-price price">+ @Model.ProductPrice.Price+ @if (Model.ProductPrice.CallForPrice)+ {+ @Loc["Products.CallForPrice"]+ }+ </div>+ }+ else+ {+ <div class="actual-price price">+ @(Model.ProductPrice.HighestBidValue > 0 ? Model.ProductPrice.HighestBid : Model.ProductPrice.StartPrice)+ </div>+ }+ @if (onSale)+ {+ <div class="old-price price">+ @Model.ProductPrice.OldPrice+ </div>+ }+ </div>+ @if (Model.ProductType == ProductType.Auction)+ {+ @if (Model.EndTime.HasValue)+ {+ <div class="countdown-box nordic-card__countdown">+ @if (Model.EndTime > DateTime.UtcNow)+ {+ <countdown :end-time="@Model.EndTime.Value.Subtract(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc)).TotalMilliseconds">+ <template v-slot:process="{ timeObj }">+ <span class="col-form-label">@Loc["AddToCart.Timeleft"]</span>+ <span>{{ `${timeObj.d}` }}@Loc["Countdown.Days"]</span>+ <span>{{ `${timeObj.h}` }}@Loc["Countdown.Hours"]</span>+ <span>{{ `${timeObj.m}` }}@Loc["Countdown.Minutes"]</span>+ <span>{{ `${timeObj.s}` }}@Loc["Countdown.Seconds"]</span>+ </template>+ <template v-slot:finish>+ <span>@Loc["ShoppingCart.Auctionends"]</span>+ </template>+ </countdown>+ }+ else+ {+ <div class="d-inline-flex flex-wrap">+ <label class="ended-label">@Loc["ShoppingCart.Auctionends"]:</label>+ <div class="count-date">@Model.EndTimeLocalTime.Value.ToString(CultureInfo.InvariantCulture)</div>+ </div>+ }+ </div>+ }+ }+ @if (Model.ReviewOverviewModel.AllowCustomerReviews)+ {+ <div class="rating">+ <partial name="Partials/Rating" model="Model.ReviewOverviewModel.AvgRating" />+ <a href="@Url.RouteUrl("Product", new { Model.SeName })">@Model.ReviewOverviewModel.TotalReviews @Loc["Reviews.Overview.Reviews"]</a>+ </div>+ }+ </div>+ </div>+ <div class="card-footer nordic-card__footer">+ @if (Model.SpecificationAttributeModels.Any())+ {+ <div class="spec-container">+ @{+ var group = Model.SpecificationAttributeModels.GroupBy(x => x.SpecificationAttributeName);+ }+ <table>+ <tbody>+ @foreach (var item in group)+ {+ <tr class="attr">+ <td>+ <div class="spec-name">+ @{+ var groupList = item.ToList();+ }+ @groupList[0].SpecificationAttributeName:+ </div>+ </td>+ <td>+ <div class="spec-value">+ @foreach (var spec in groupList)+ {+ <span>+ @Html.Raw(spec.ValueRaw)+ </span>+ }+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ @if (Model.ProductAttributeModels.Any())+ {+ <div class="attr-container">+ <table>+ <tbody>+ @foreach (var item in Model.ProductAttributeModels)+ {+ <tr class="attr @(item.AttributeControlType == AttributeControlType.ColorSquares ? "attr--color" : "")">+ <td>+ <div class="attr-name">+ @item.Name+ </div>+ </td>+ <td>+ <div class="attr-value">+ @foreach (var spec in item.Values)+ {+ switch (item.AttributeControlType)+ {+ case AttributeControlType.DropdownList:+ case AttributeControlType.RadioList:+ case AttributeControlType.Checkboxes:+ case AttributeControlType.ReadonlyCheckboxes:+ <a class="btn btn-sm btn-light name" href="@Url.RouteUrl("Product", new { Model.SeName })[email protected][email protected](spec.Name)">+ @Html.Raw(spec.Name)+ </a>+ break;+ case AttributeControlType.ColorSquares:+ if (spec.PictureModel.FullSizeImageUrl != null)+ {+ <a class="btn btn-sm btn-light name color-container" title="@spec.Name" @@click="productImage($event)" data-href="@spec.PictureModel.FullSizeImageUrl">+ <span class="color" style="background-color:@spec.ColorSquaresRgb;"> </span>+ </a>+ }+ else+ {+ <a class="btn btn-sm btn-light name color-container" title="@spec.Name" href="@Url.RouteUrl("Product", new { Model.SeName })[email protected][email protected](spec.Name)">+ <span class="color" style="background-color:@spec.ColorSquaresRgb;"> </span>+ </a>+ }++ break;+ case AttributeControlType.ImageSquares:+ if (spec.PictureModel.FullSizeImageUrl != null)+ {+ <a class="btn btn-sm btn-light p-1 name image-container" v-on:click='productImage' data-href="@spec.PictureModel.FullSizeImageUrl">+ <img src="@spec.ImageSquaresPictureModel?.ImageUrl" alt="@spec.Name"/>+ </a>+ }+ else+ {+ <a class="btn btn-sm btn-light p-1 name image-container" href="@Url.RouteUrl("Product", new { Model.SeName })[email protected][email protected](spec.Name)">+ <img src="@spec.ImageSquaresPictureModel?.ImageUrl" alt="@spec.Name"/>+ </a>+ }++ break;+ }+ }+ </div>+ </td>+ </tr>+ }+ </tbody>+ </table>+ </div>+ }+ <div class="desc" v-pre>+ @Html.Raw(Model.ShortDescription)+ </div>+ @if (Model.ShowQty)+ {+ var qtyId = "addtocart_" + Model.Id + "_EnteredQuantity";+ <input class="form-control input-group-addon catalog-quantity" type="number" min="1" id="@qtyId" name="@qtyId" value="1">+ }+ <div class="btn-group nordic-card__actions">+ @if (!Model.ProductPrice.DisableBuyButton)+ {+ var addToCartText = Loc["ShoppingCart.AddToCart"];+ if (Model.ProductType == ProductType.Reservation)+ {+ addToCartText = Loc["ShoppingCart.Reservation"];+ }++ if (Model.ProductPrice.AvailableForPreOrder)+ {+ addToCartText = Loc["ShoppingCart.PreOrder"];+ }++ <button class="btn btn-info nordic-card__cart" data-cart-action="add" data-url="@Model.AddToCartUrl" data-show-qty="@Model.ShowQty" data-product-id="@Model.Id">+ <i class="b-icon bi bi-bag" aria-hidden="true"></i>+ <span class="add-cart-text">@(addToCartText)</span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ }+ else+ {+ if (Model.ProductType == ProductType.Auction)+ {+ var addToCartText = Loc["ShoppingCart.Bids"];+ <button class="btn btn-info nordic-card__cart" data-cart-action="add" data-url="@Model.AddToCartUrl" data-show-qty="false" data-product-id="@Model.Id">+ <i class="b-icon bi bi-hammer" aria-hidden="true"></i>+ <span class="add-cart-text">@(addToCartText)</span>+ <span class="visually-hidden">AddToCart</span>+ </button>+ }+ }+ @if (!Model.ProductPrice.DisableWishlistButton && Model.ProductType == ProductType.SimpleProduct)+ {+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToWishlist"]" class="btn btn-secondary nordic-card__icon" data-cart-action="add" data-url="@Model.AddToWishlistUrl" data-show-qty="@Model.ShowQty" data-product-id="@Model.Id">+ <i class="b-icon bi bi-heart" aria-hidden="true"></i>+ <span class="visually-hidden">AddToWishlist</span>+ </button>+ }+ @if (!Model.ProductPrice.DisableAddToCompareListButton && Model.ProductType == ProductType.SimpleProduct)+ {+ <button data-bs-toggle="tooltip" data-bs-placement="bottom" title="@Loc["ShoppingCart.AddToCompareList"]" class="btn btn-secondary nordic-card__icon" data-cart-action="compare" data-product-id="@Model.Id">+ <span class="visually-hidden">AddToCompareList</span>+ <i class="b-icon bi bi-shuffle" aria-hidden="true"></i>+ </button>+ }+ </div>+ </div>+</article>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Head.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Head.cshtmlnew file mode 100644index 000000000..8b122aff6--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Head.cshtml@@ -0,0 +1,69 @@+@inject IContextAccessor contextAccessor++@{+ var supportRtl = contextAccessor.WorkContext.WorkingLanguage.Rtl;++ <partial name="Partials/ColorScheme"/>++ @*+ `defer` on all three scripts, not just this one: deferred scripts run in document+ order after parsing, so the head bundle keeps executing before app.js mounts #app.+ Deferring only the bundle would invert that and app.js would find no Vue.++ Without it this is a parser-blocking script in <head>, so the browser does not even+ build the DOM for the page body until 399 kB of JavaScript has arrived and run -+ measured at 6.4 s on Slow 4G, against 0.7 s with defer.+ *@+ <script defer asp-location="Head" src="/bundles/app.runtime.bundle.js" asp-append-version="true"></script>+ <link asp-src="/bundles/libs.css" rel="stylesheet" asp-append-version="true">++ <link rel="stylesheet" type="text/css" asp-src="/assets/custom/style.css">++ <environment include="Development">+ @if (supportRtl)+ {+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/common/common.rtl.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/header/header.rtl.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/catalog/catalog.rtl.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/product/product.rtl.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/customer/customer.rtl.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/cart/cart.rtl.css" asp-append-version="true">+ }+ else+ {+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/common/common.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/header/header.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/catalog/catalog.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/product/product.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/customer/customer.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/theme/css/cart/cart.css" asp-append-version="true">+ }+ </environment>+ <environment include="Production">+ @if (supportRtl)+ {+ <link rel="stylesheet" type="text/css" asp-src="/bundles/style.rtl.min.css" asp-append-version="true">+ }+ else+ {+ <link rel="stylesheet" type="text/css" asp-src="/bundles/style.min.css" asp-append-version="true">+ }+ </environment>++ @* Nordic Editorial: loaded after Default in both environments so it wins by cascade order *@+ <link rel="preload" href="/Plugins/Theme.Nordic/Content/fonts/fraunces-latin-var.woff2" as="font" type="font/woff2" crossorigin>+ <link rel="preload" href="/Plugins/Theme.Nordic/Content/fonts/inter-latin-var.woff2" as="font" type="font/woff2" crossorigin>+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/fonts.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/tokens.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/base.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/header.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/home.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/catalog.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/product.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/content.css" asp-append-version="true">+ <link rel="stylesheet" type="text/css" asp-src="/Plugins/Theme.Nordic/Content/css/account-cart.css" asp-append-version="true">++ <partial name="Partials/JsResources"/>+ <script defer asp-location="Footer" asp-src="/theme/script/app.js" asp-order="900" asp-append-version="true"></script>+ <script defer asp-location="Footer" asp-src="/assets/custom/script.js" asp-order="901"></script>+}\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Header.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Header.cshtmlnew file mode 100644index 000000000..e7e124ed1--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Header.cshtml@@ -0,0 +1,133 @@+@using System.Text.Encodings.Web+@inject IContextAccessor contextAccessor+@inject StoreInformationSettings StoreInformationSettings+@inject CommonSettings CommonSettings+@{+ var supportRtl = contextAccessor.WorkContext.WorkingLanguage.Rtl;++ @* Nordic: the promotional line is store content from the HeaderPromoText page; the bar+ is left out entirely when that page is missing or unpublished (PageBlock renders "") *@+ var promo = await Component.InvokeAsync("PageBlock", new { systemName = "HeaderPromoText" });+ string promoHtml;+ using (var promoWriter = new StringWriter())+ {+ promo.WriteTo(promoWriter, HtmlEncoder.Default);+ promoHtml = promoWriter.ToString();+ }+}+@if (!string.IsNullOrWhiteSpace(promoHtml))+{+ <div class="nordic-topbar">+ @Html.Raw(promoHtml)+ </div>+}+@*<header> rather than a plain div: this is the site banner landmark, and it was the+ only region of the page a screen reader had no way to jump to*@+<header class="header-nav nordic-header" vue-island>+ <nav class="navbar navbar-light navbar-expand">+ <div class="container" id="header-container">+ <div class="menu-container">+ <button aria-label="menu-toggler" class="btn menu-toggler" data-bs-toggle="offcanvas" data-bs-target="#sidebar-menu" aria-controls="sidebar-menu">+ <span></span><span></span><span></span>+ </button>+ </div>+ @*desktop only: search on the left of the wordmark; phones keep the icon in the bar*@+ <div class="nordic-header-left">+ <button type="button" class="nordic-header-link" data-bs-toggle="modal" data-bs-target="#search-box">+ <i class="b-icon bi bi-search" aria-hidden="true"></i>+ <span>@Loc["Search"]</span>+ </button>+ </div>+ <partial name="Partials/Logo"/>+ <ul class="navbar-nav top-header-items order-3">+ <li class="nav-item">+ <span class="nav-link">+ <div class="form-check form-switch form-check-lg contrast-switch">+ <input class="form-check-input" type="checkbox" id="contrast-button" name="contrast-button" v-model="darkMode">+ <label class="form-check-label" for="contrast-button">+ <i class="b-icon bi bi-sun light text-info" aria-hidden="true"></i>+ <i class="b-icon bi bi-moon dark text-dark" aria-hidden="true"></i>+ </label>+ </div>+ </span>+ </li>+ <li class="nav-item nordic-search-item">+ <a href="#" target="_self" class="nav-link" @@click.prevent>+ <i class="b-icon bi bi-search" :class="[darkMode ? 'text-white' : 'text-dark']" data-bs-toggle="modal" data-bs-target="#search-box" aria-hidden="true"></i>+ </a>+ </li>+ <li class="nav-item">+ <span class="nav-link">+ <i class="b-icon bi bi-person-circle" :class="[darkMode ? 'text-white' : 'text-dark']" data-bs-toggle="offcanvas" data-bs-target="#sidebar-right" aria-controls="sidebar-right" aria-hidden="true"></i>+ </span>+ </li>+ <partial name="Partials/ShoppingCartLinks"/>+ </ul>+ </div>+ </nav>+ @*Nordic: the catalogue menu as a centred row on desktop. The drawer below still carries+ the full menu for phones and tablets. v-pre: category names are database content and+ this sits inside a Vue island.*@+ <nav class="nordic-menu-row" aria-label="@Loc["Categories"]" v-pre>+ <ul class="nordic-menu">+ @await Component.InvokeAsync("Menu")+ </ul>+ </nav>+</header>+@* Drawers and the search modal are rendered at the top level of #app, outside+ .header-nav: that element is position:sticky with a z-index, so it forms a+ stacking context, and anything inside it ends up underneath the backdrop that+ Bootstrap appends to <body>. It also keeps the drawers out of+ <nav class="navbar-expand">, which Bootstrap would otherwise flatten into the+ bar. The triggers stay in the header and reference these by id. *@+<div class="offcanvas @(supportRtl ? "offcanvas-end b-sidebar b-sidebar-right" : "offcanvas-start b-sidebar") shadow" tabindex="-1" id="sidebar-menu" aria-labelledby="sidebar-menu-label">+ <div class="b-sidebar-header">+ <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>+ <strong class="ms-2" id="sidebar-menu-label"></strong>+ </div>+ <div class="b-sidebar-body">+ @*the catalogue menu is a navigation landmark of its own, and it lives+ in a drawer rather than inside <nav> up in the bar*@+ <nav aria-label="@Loc["Categories"]">+ <ul class="Menu -vertical">+ @await Component.InvokeAsync("Menu")+ </ul>+ </nav>+ </div>+</div>+<div class="offcanvas @(!supportRtl ? "offcanvas-end b-sidebar b-sidebar-right" : "offcanvas-start b-sidebar")" tabindex="-1" id="sidebar-right" aria-labelledby="sidebar-right-label">+ <div class="b-sidebar-header">+ <button type="button" class="btn-close" data-bs-dismiss="offcanvas" aria-label="Close"></button>+ <strong class="ms-2" id="sidebar-right-label">@Loc["Account.MyAccount"]</strong>+ </div>+ <div class="b-sidebar-body user-panel">+ <div class="d-inline-flex flex-wrap mb-2">+ <partial name="Partials/Selector_TaxType"/>+ <partial name="Partials/Selector_Currency"/>+ <partial name="Partials/Selector_Language"/>+ @if (CommonSettings.AllowToSelectStore)+ {+ <partial name="Partials/Selector_Store"/>+ }+ @if (StoreInformationSettings.AllowCustomerToSelectTheme)+ {+ <partial name="Partials/Selector_Theme"/>+ }+ @await Component.InvokeAsync("Widget", new { widgetZone = "header_selectors" })+ </div>+ <partial name="Partials/HeaderLinks"/>+ </div>+</div>+<partial name="Partials/SidebarPanels"/>+@*dark-theme dropped: <html> and <body> carry it from Partials/ColorScheme, and+ the search box is styled off those*@+<div class="modal fade" id="search-box" tabindex="-1" aria-hidden="true">+ <div class="modal-dialog modal-xl">+ <div class="modal-content">+ <div class="modal-body">+ @await Component.InvokeAsync("SearchBox")+ </div>+ </div>+ </div>+</div>+<script type="application/json" data-grand-vm="searchModal">{"elements":{"modalId":"search-box"}}</script>diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Logo.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Logo.cshtmlnew file mode 100644index 000000000..acf205fe9--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/Logo.cshtml@@ -0,0 +1,17 @@+@using Grand.Business.Core.Interfaces.Storage+@inject StoreInformationSettings storeInformation+@inject IContextAccessor contextAccessor+@inject IPictureService pictureService+@*Nordic: the merchant's logo when one is set; a store without one gets its name as a serif wordmark*@+@if (!string.IsNullOrEmpty(storeInformation.LogoPictureId))+{+ var urlLogo = await pictureService.GetPictureUrl(storeInformation.LogoPictureId);+ <a class="navbar-brand store-logo mx-lg-0 mx-auto" target="_self" href="@Url.RouteUrl("HomePage")">+ <img width="236" height="53" src="@urlLogo" alt="@contextAccessor.StoreContext.CurrentStore.Name" />+ <span class="visually-hidden">@Loc["Logo"]</span>+ </a>+}+else+{+ <a class="navbar-brand store-logo nordic-wordmark mx-lg-0 mx-auto" target="_self" href="@Url.RouteUrl("HomePage")">@contextAccessor.StoreContext.CurrentStore.Name</a>+}diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/NewsletterBox.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/NewsletterBox.cshtmlnew file mode 100644index 000000000..27d4ce519--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/Shared/Partials/NewsletterBox.cshtml@@ -0,0 +1,45 @@+@inject CustomerSettings customerSettings++@if (!customerSettings.HideNewsletterBlock)+{+ <section class="newsletter nordic-newsletter" vue-island>+ <div class="newsletter-subscribe container" id="newsletter-subscribe-block">+ <h2 class="newsletter-title">@Loc["Newsletter.Title"]</h2>+ <div class="newsletter-desc">@Loc["Newsletter.Desc"]</div>+ <div class="newsletter-inputs">+ <div class="nordic-newsletter__field" role="group">+ <label for="newsletter-email" class="visually-hidden">newsletter</label>+ <input id="newsletter-email" type="email" class="form-control newsletter-email"+ placeholder="@Loc["Newsletter.Email.Placeholder"]" aria-label="@Loc["Newsletter.Email.Placeholder"]"/>+ <button class="btn newsletter-email-button" id="newsletter-subscribe-button" @@click="newsletterBox(@customerSettings.NewsletterBlockAllowToUnsubscribe.ToString().ToLower(), '@(Url.RouteUrl("SubscribeNewsletter"))')">+ @Loc["Newsletter.Options.Subscribe"] <span aria-hidden="true">→</span>+ </button>+ </div>++ @if (customerSettings.NewsletterBlockAllowToUnsubscribe)+ {+ <div class="custom-controls-stacked newsletter-subscribe-unsubscribe">+ <fieldset class="d-inline-flex justify-content-center w-100">+ <div class="form-check mb-2">+ <input value="newsletter_unsubscribe" id="newsletter_subscribe" ref="newsletterSubscribe" name="newsletter_block" type="radio" class="form-check-input" checked="checked">+ <label class="form-check-label" for="newsletter_subscribe">@Loc["Newsletter.Options.Subscribe"]</label>+ </div>+ <div class="form-check ms-3 mb-2">+ <input value="newsletter_unsubscribe" id="newsletter_unsubscribe" name="newsletter_block" type="radio" class="form-check-input">+ <label class="form-check-label" for="newsletter_unsubscribe">@Loc["Newsletter.Options.Unsubscribe"]</label>+ </div>+ </fieldset>+ </div>+ }+ <div class="newsletter-validation">+ <span id="subscribe-loading-progress" style="display: none;" class="please-wait">@Loc["Common.Wait..."]</span>+ </div>+ <div id="newsletter-result-block" style="display: none;" class="newsletter-result">+ <div class="alert alert-info">+ </div>+ </div>+ </div>+ <input type="hidden" id="newsletterbox" data-href="@(Url.RouteUrl("SubscribeNewsletter"))" data-allowtounsubscribe=@customerSettings.NewsletterBlockAllowToUnsubscribe/>+ </div>+ </section>+}diff --git a/src/Plugins/Theme.Nordic/Views/Nordic/_ViewImports.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/_ViewImports.cshtmlnew file mode 100644index 000000000..f75cbe23f--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/_ViewImports.cshtml@@ -0,0 +1,47 @@+@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers+@*we remove the default InputTagHelper to prevent the checkbox duplicating: https://stackoverflow.com/questions/42544961/asp-net-core-custom-input-tag-helper-rendering-duplicate-checkboxes*@+@removeTagHelper Microsoft.AspNetCore.Mvc.TagHelpers.InputTagHelper, Microsoft.AspNetCore.Mvc.TagHelpers+@addTagHelper *, Grand.Web.Common+@addTagHelper *, Grand.Web++@using System.Text;+@using Microsoft.AspNetCore.Http.Extensions+@using Microsoft.AspNetCore.Mvc.Localization+@using Microsoft.AspNetCore.Mvc.ViewFeatures+@using System.Net+@using Grand.SharedKernel.Extensions+@using Grand.Web.Common+@using Grand.Web.Common.Page+@using Grand.Web.Common.Extensions+@using Grand.Web.Common.Security.Captcha+@using Grand.Web.Common.Themes+@using Grand.Web.Extensions+@using Grand.Web.Models.Blogs+@using Grand.Web.Models.Catalog+@using Grand.Web.Models.Contact+@using Grand.Web.Models.Checkout+@using Grand.Web.Models.Cms+@using Grand.Web.Models.Common+@using Grand.Web.Models.Course+@using Grand.Web.Models.Customer+@using Grand.Web.Models.Knowledgebase+@using Grand.Web.Models.Media+@using Grand.Web.Models.News+@using Grand.Web.Models.Newsletter+@using Grand.Web.Models.Orders+@using Grand.Web.Models.ShoppingCart+@using Grand.Web.Models.Pages+@using Grand.Web.Models.Vendors+@using Grand.Domain+@using Grand.Domain.Catalog+@using Grand.Domain.Common+@using Grand.Domain.Orders+@using Grand.Domain.Customers+@using Grand.Domain.Tax+@using Grand.Domain.Seo+@using Grand.Domain.Stores+@using Grand.Infrastructure+@using Grand.Web.Common.Localization+@using Theme.Nordic++@inject LocService Loc\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/Views/Nordic/_ViewStart.cshtml b/src/Plugins/Theme.Nordic/Views/Nordic/_ViewStart.cshtmlnew file mode 100644index 000000000..1af6e4946--- /dev/null+++ b/src/Plugins/Theme.Nordic/Views/Nordic/_ViewStart.cshtml@@ -0,0 +1,3 @@+@{+ Layout = "_Layout";+}\ No newline at end of filediff --git a/src/Plugins/Theme.Nordic/logo.jpg b/src/Plugins/Theme.Nordic/logo.jpgnew file mode 100644index 000000000..f90c6d5c6Binary files /dev/null and b/src/Plugins/Theme.Nordic/logo.jpg differdiff --git a/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj b/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csprojindex e612a47ca..9a12b4995 100644--- a/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj+++ b/src/Tests/Grand.Modules.Tests/Grand.Modules.Tests.csproj@@ -22,6 +22,11 @@<ProjectReference Include="..\..\Modules\Grand.Module.Installer\Grand.Module.Installer.csproj" /><ProjectReference Include="..\..\Modules\Grand.Module.Migration\Grand.Module.Migration.csproj" /><ProjectReference Include="..\..\Modules\Grand.Module.ScheduledTasks\Grand.Module.ScheduledTasks.csproj" />+ <ProjectReference Include="..\..\Plugins\Theme.Nordic\Theme.Nordic.csproj" />+ <ProjectReference Include="..\..\Web\Grand.Web.Common\Grand.Web.Common.csproj" />+ <!-- Theme.Nordic compiles against Grand.Web; without it in the output, MigrationManager's+ assembly scan fails to load Theme.Nordic.dll -->+ <ProjectReference Include="..\..\Web\Grand.Web\Grand.Web.csproj" /><ProjectReference Include="..\Grand.Data.Tests\Grand.Data.Tests.csproj" /></ItemGroup>diff --git a/src/Tests/Grand.Modules.Tests/Installer/SampleAssetsTests.cs b/src/Tests/Grand.Modules.Tests/Installer/SampleAssetsTests.csindex 27daa7a90..612cca787 100644--- a/src/Tests/Grand.Modules.Tests/Installer/SampleAssetsTests.cs+++ b/src/Tests/Grand.Modules.Tests/Installer/SampleAssetsTests.cs@@ -7,7 +7,7 @@ namespace Grand.Modules.Tests.Installer;public class SampleAssetsTests{private static readonly Regex SampleFile =- new(@"""((?:product|category|brand|collection|blog|news|vendor)_[A-Za-z0-9_\-]+\.(?:jpg|jpeg|png))""", RegexOptions.Compiled);+ new(@"""((?:product|category|brand|collection|blog|news|vendor|logo)_[A-Za-z0-9_\-]+\.(?:jpg|jpeg|png))""", RegexOptions.Compiled);private static IEnumerable<string> ReferencedFiles() =>Directory.GetFiles(RepositoryPaths.InstallerServices, "*.cs")diff --git a/src/Tests/Grand.Modules.Tests/Installer/SampleThemeTests.cs b/src/Tests/Grand.Modules.Tests/Installer/SampleThemeTests.csnew file mode 100644index 000000000..f57dc05dc--- /dev/null+++ b/src/Tests/Grand.Modules.Tests/Installer/SampleThemeTests.cs@@ -0,0 +1,43 @@+using System.Text.RegularExpressions;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Modules.Tests.Installer;++/// <summary>+/// A sample-data install opens in the Nordic theme with a header promo line; a plain install+/// stays on Default with no promo page. Read from the installer sources, like the other+/// sample-data guards in this folder.+/// </summary>+[TestClass]+public class SampleThemeTests+{+ private static string Read(string file) => File.ReadAllText(Path.Combine(RepositoryPaths.InstallerServices, file));++ [TestMethod]+ public void DefaultStoreTheme_IsNordicOnlyForSampleInstalls()+ {+ StringAssert.Contains(Read("InstallDataSettings.cs"), "DefaultStoreTheme = installSampleData ? \"Nordic\" : \"Default\"");+ }++ [TestMethod]+ public void StoreLogo_SampleInstallsGetTheNordicLogo()+ {+ //the stock logo is teal on a white ground; the Nordic one is a warm mid tone that reads+ //on both the light and the dark scheme+ Assert.IsTrue(Regex.IsMatch(Read("InstallDataSettings.cs"),+ @"installSampleData\s*\?\s*Path\.Combine\([^;]*""logo_nordic\.png""[^;]*:\s*Path\.Combine\([^;]*""logo\.png""", RegexOptions.Singleline),+ "sample installs must seed assets/samples/logo_nordic.png, plain installs logo.png");+ Assert.IsTrue(File.Exists(Path.Combine(RepositoryPaths.Samples, "logo_nordic.png")), "logo_nordic.png is missing from wwwroot/assets/samples");+ }++ [TestMethod]+ public void HeaderPromoTextPage_IsAddedOnlyForSampleInstalls()+ {+ var source = Read("InstallDataPages.cs");+ Assert.IsTrue(Regex.IsMatch(source,+ @"if\s*\(\s*installSampleData\s*\)\s*(?:\{\s*)?pages\.Add\(\s*new\s+Page\s*\{\s*SystemName\s*=\s*""HeaderPromoText""",+ RegexOptions.Singleline),+ "HeaderPromoText must be added inside an if (installSampleData) block");+ Assert.AreEqual(1, Regex.Matches(source, @"""HeaderPromoText""").Count, "HeaderPromoText must be seeded once");+ }+}diff --git a/src/Tests/Grand.Modules.Tests/Themes/NordicLogoTests.cs b/src/Tests/Grand.Modules.Tests/Themes/NordicLogoTests.csnew file mode 100644index 000000000..e75fa90cc--- /dev/null+++ b/src/Tests/Grand.Modules.Tests/Themes/NordicLogoTests.cs@@ -0,0 +1,28 @@+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Modules.Tests.Themes;++/// <summary>+/// The spec's header centre is "the store name as a serif wordmark (or logo)": a merchant who+/// uploaded a logo keeps it under Nordic; the wordmark is for stores without one.+/// </summary>+[TestClass]+public class NordicLogoTests+{+ private static string Logo => File.ReadAllText(Path.Combine(Installer.RepositoryPaths.Root,+ "src", "Plugins", "Theme.Nordic", "Views", "Nordic", "Shared", "Partials", "Logo.cshtml"));++ [TestMethod]+ public void Logo_RendersTheMerchantPictureWhenOneIsSet()+ {+ StringAssert.Contains(Logo, "LogoPictureId");+ StringAssert.Contains(Logo, "<img");+ }++ [TestMethod]+ public void Logo_FallsBackToTheWordmark()+ {+ StringAssert.Contains(Logo, "nordic-wordmark");+ StringAssert.Contains(Logo, "CurrentStore.Name");+ }+}diff --git a/src/Tests/Grand.Modules.Tests/Themes/NordicTextTests.cs b/src/Tests/Grand.Modules.Tests/Themes/NordicTextTests.csnew file mode 100644index 000000000..467044f18--- /dev/null+++ b/src/Tests/Grand.Modules.Tests/Themes/NordicTextTests.cs@@ -0,0 +1,47 @@+using Microsoft.Extensions.Localization;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;+using Theme.Nordic;++namespace Grand.Modules.Tests.Themes;++/// <summary>+/// A theme is selectable without installing its plugin, so the Nordic labels must read as+/// English rather than as resource keys when the plugin's resources were never installed.+/// </summary>+[TestClass]+public class NordicTextTests+{+ private const string Key = "Theme.Nordic.Badge.Sale";++ private static IStringLocalizer Localizer(string value, bool notFound)+ {+ var loc = new Mock<IStringLocalizer>();+ loc.Setup(x => x[Key]).Returns(new LocalizedString(Key, value, notFound));+ return loc.Object;+ }++ [TestMethod]+ public void Get_ResourceInstalled_ReturnsTranslation()+ {+ Assert.AreEqual("Wyprzedaż", NordicText.Get(Localizer("Wyprzedaż", false), Key));+ }++ [TestMethod]+ public void Get_TranslationServiceEchoesLowerCasedKey_ReturnsEnglishDefault()+ {+ Assert.AreEqual("Sale", NordicText.Get(Localizer(Key.ToLowerInvariant(), false), Key));+ }++ [TestMethod]+ public void Get_ResourceNotFound_ReturnsEnglishDefault()+ {+ Assert.AreEqual("Sale", NordicText.Get(Localizer(Key, true), Key));+ }++ [TestMethod]+ public void Get_EmptyValue_ReturnsEnglishDefault()+ {+ Assert.AreEqual("Sale", NordicText.Get(Localizer("", false), Key));+ }+}diff --git a/src/Tests/Grand.Modules.Tests/Themes/NordicThemeResourcesTests.cs b/src/Tests/Grand.Modules.Tests/Themes/NordicThemeResourcesTests.csnew file mode 100644index 000000000..9287339a2--- /dev/null+++ b/src/Tests/Grand.Modules.Tests/Themes/NordicThemeResourcesTests.cs@@ -0,0 +1,33 @@+using System.Text.RegularExpressions;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Theme.Nordic;++namespace Grand.Modules.Tests.Themes;++[TestClass]+public class NordicThemeResourcesTests+{+ private static string NordicViews => Path.Combine(Installer.RepositoryPaths.Root, "src", "Plugins", "Theme.Nordic", "Views", "Nordic");++ [TestMethod]+ public void EveryThemeResourceUsedInViewsIsInstalledByThePlugin()+ {+ var used = Directory.GetFiles(NordicViews, "*.cshtml", SearchOption.AllDirectories)+ .SelectMany(f => Regex.Matches(File.ReadAllText(f), @"""(Theme\.Nordic\.[^""]+)""").Select(m => m.Groups[1].Value))+ .Distinct()+ .ToList();++ var missing = used.Where(key => !NordicThemePlugin.Resources.ContainsKey(key)).ToList();+ Assert.AreEqual(0, missing.Count, $"not installed by NordicThemePlugin: {string.Join(", ", missing)}");+ }++ [TestMethod]+ public void ThemeResourcesAreNamespacedAndHaveValues()+ {+ foreach (var (name, value) in NordicThemePlugin.Resources)+ {+ StringAssert.StartsWith(name, "Theme.Nordic.");+ Assert.IsFalse(string.IsNullOrWhiteSpace(value), name);+ }+ }+}diff --git a/src/Tests/Grand.Modules.Tests/Themes/NordicThemeViewTests.cs b/src/Tests/Grand.Modules.Tests/Themes/NordicThemeViewTests.csnew file mode 100644index 000000000..8f50d66b6--- /dev/null+++ b/src/Tests/Grand.Modules.Tests/Themes/NordicThemeViewTests.cs@@ -0,0 +1,37 @@+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Theme.Nordic;++namespace Grand.Modules.Tests.Themes;++[TestClass]+public class NordicThemeViewTests+{+ private readonly NordicThemeView _view = new();++ [TestMethod]+ public void ThemeName_MatchesViewFolder()+ {+ Assert.AreEqual("Nordic", _view.ThemeName);+ Assert.IsTrue(Directory.Exists(Path.Combine(Installer.RepositoryPaths.Root, "src", "Plugins", "Theme.Nordic", "Views", _view.ThemeName)));+ }++ [TestMethod]+ public void ViewLocations_ThemeFirst_DefaultFallbacksLast()+ {+ CollectionAssert.AreEqual(new[] {+ "/Views/Nordic/{1}/{0}.cshtml",+ "/Views/Nordic/Shared/{0}.cshtml",+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ }, _view.GetViewLocations().ToArray());+ }++ [TestMethod]+ public void ThemeInfo_PreviewImageExists_StorefrontArea()+ {+ Assert.AreEqual("", _view.AreaName);+ Assert.AreEqual("~/Plugins/Theme.Nordic/Content/theme.jpg", _view.ThemeInfo.PreviewImageUrl);+ Assert.IsTrue(File.Exists(Path.Combine(Installer.RepositoryPaths.Root, "src", "Plugins", "Theme.Nordic", "Content", "theme.jpg")));+ Assert.IsFalse(_view.ThemeInfo.SupportRtl);+ }+}diff --git a/src/Tests/Grand.Modules.Tests/Themes/NordicViewContractTests.cs b/src/Tests/Grand.Modules.Tests/Themes/NordicViewContractTests.csnew file mode 100644index 000000000..ee39c812f--- /dev/null+++ b/src/Tests/Grand.Modules.Tests/Themes/NordicViewContractTests.cs@@ -0,0 +1,62 @@+using System.Text.RegularExpressions;+using Microsoft.VisualStudio.TestTools.UnitTesting;++namespace Grand.Modules.Tests.Themes;++[TestClass]+public class NordicViewContractTests+{+ private static string NordicViews => Path.Combine(Installer.RepositoryPaths.Root, "src", "Plugins", "Theme.Nordic", "Views", "Nordic");+ private static string DefaultViews => Path.Combine(Installer.RepositoryPaths.Root, "src", "Web", "Grand.Web", "Views");++ public static IEnumerable<object[]> CopiedViews() =>+ Directory.GetFiles(NordicViews, "*.cshtml", SearchOption.AllDirectories)+ .Select(f => Path.GetRelativePath(NordicViews, f))+ .Where(r => !r.StartsWith("_View"))+ .Select(r => new object[] { r });++ private static string Read(string root, string rel) => File.ReadAllText(Path.Combine(root, rel));++ private static SortedSet<string> Matches(string text, string pattern) =>+ new(Regex.Matches(text, pattern).Select(m => m.Groups[1].Value));++ [TestMethod]+ public void EveryCopiedViewHasADefaultCounterpart()+ {+ foreach (var row in CopiedViews())+ Assert.IsTrue(File.Exists(Path.Combine(DefaultViews, (string)row[0])), $"{row[0]} has no Default counterpart");+ }++ [TestMethod]+ [DynamicData(nameof(CopiedViews), DynamicDataSourceType.Method)]+ public void EveryCopiedViewKeepsDefaultModel(string rel) =>+ CollectionAssert.AreEqual(Matches(Read(DefaultViews, rel), @"@model\s+([^\r\n]+)").ToList(),+ Matches(Read(NordicViews, rel), @"@model\s+([^\r\n]+)").ToList(), rel);++ [TestMethod]+ [DynamicData(nameof(CopiedViews), DynamicDataSourceType.Method)]+ public void EveryCopiedViewKeepsWidgetZones(string rel)+ {+ const string zones = @"(?:widgetZone\s*=\s*""|widget-zone=""|WidgetZone\s*=\s*"")([^""]+)""";+ var missing = Matches(Read(DefaultViews, rel), zones).Except(Matches(Read(NordicViews, rel), zones)).ToList();+ Assert.AreEqual(0, missing.Count, $"{rel} dropped widget zones: {string.Join(", ", missing)}");+ }++ [TestMethod]+ [DynamicData(nameof(CopiedViews), DynamicDataSourceType.Method)]+ public void EveryCopiedViewKeepsDataHooksAndPartials(string rel)+ {+ var d = Read(DefaultViews, rel);+ var n = Read(NordicViews, rel);+ foreach (var pattern in new[] {+ @"(data-[a-z-]+)=", // data attributes used by app.js / Vue+ @"<partial name=""([^""]+)""", // partials still rendered+ @"InvokeAsync\(""([^""]+)""", // view components still invoked+ @"RouteUrl\(""([^""]+)""" // routes still linked+ })+ {+ var missing = Matches(d, pattern).Except(Matches(n, pattern)).ToList();+ Assert.AreEqual(0, missing.Count, $"{rel} dropped {pattern}: {string.Join(", ", missing)}");+ }+ }+}diff --git a/src/Tests/Grand.Web.Common.Tests/View/DefaultAreaViewFactoryTests.cs b/src/Tests/Grand.Web.Common.Tests/View/DefaultAreaViewFactoryTests.csnew file mode 100644index 000000000..449ad91ed--- /dev/null+++ b/src/Tests/Grand.Web.Common.Tests/View/DefaultAreaViewFactoryTests.cs@@ -0,0 +1,72 @@+using Grand.Web.Common.Themes;+using Grand.Web.Common.View;+using Microsoft.VisualStudio.TestTools.UnitTesting;+using Moq;++namespace Grand.Web.Common.Tests.View;++/// <summary>+/// A store whose DefaultStoreTheme names a theme that is not installed (a sample install made+/// Nordic the default, then the plugin was removed) must still render: the storefront falls+/// back to the Default views instead of looking in folders nobody registered.+/// </summary>+[TestClass]+public class DefaultAreaViewFactoryTests+{+ private static readonly string[] DefaultLocations = { "/Views/{1}/{0}.cshtml", "/Views/Shared/{0}.cshtml" };++ private static DefaultAreaViewFactory Factory(string currentTheme, params IThemeView[] themes)+ {+ var themeContext = new Mock<IThemeContext>();+ themeContext.Setup(x => x.GetCurrentTheme()).Returns(currentTheme);+ var contextFactory = new Mock<IThemeContextFactory>();+ contextFactory.Setup(x => x.GetThemeContext("")).Returns(themeContext.Object);+ return new DefaultAreaViewFactory(themes, contextFactory.Object);+ }++ private static IThemeView Theme(string name, string area = "")+ {+ var theme = new Mock<IThemeView>();+ theme.Setup(x => x.ThemeName).Returns(name);+ theme.Setup(x => x.AreaName).Returns(area);+ theme.Setup(x => x.GetViewLocations()).Returns(new[] { $"/Views/{name}/{{1}}/{{0}}.cshtml", $"/Views/{name}/Shared/{{0}}.cshtml" });+ return theme.Object;+ }++ [TestMethod]+ public void GetViewLocations_ThemeNotRegistered_FallsBackToDefaultViews()+ {+ var factory = Factory("Nordic", Theme("Modern"));++ CollectionAssert.AreEqual(DefaultLocations, factory.GetViewLocations(Array.Empty<string>()).ToArray());+ }++ [TestMethod]+ public void GetViewLocations_ThemeRegisteredForAnotherArea_FallsBackToDefaultViews()+ {+ var factory = Factory("Nordic", Theme("Nordic", "Admin"));++ CollectionAssert.AreEqual(DefaultLocations, factory.GetViewLocations(Array.Empty<string>()).ToArray());+ }++ [TestMethod]+ public void GetViewLocations_ThemeRegistered_PutsThemeFirstThenDefaultViews()+ {+ var factory = Factory("Nordic", Theme("Modern"), Theme("Nordic"));++ CollectionAssert.AreEqual(new[] {+ "/Views/Nordic/{1}/{0}.cshtml",+ "/Views/Nordic/Shared/{0}.cshtml",+ "/Views/{1}/{0}.cshtml",+ "/Views/Shared/{0}.cshtml"+ }, factory.GetViewLocations(Array.Empty<string>()).ToArray());+ }++ [TestMethod]+ public void GetViewLocations_NoThemeSet_UsesDefaultViews()+ {+ var factory = Factory("", Theme("Nordic"));++ CollectionAssert.AreEqual(DefaultLocations, factory.GetViewLocations(Array.Empty<string>()).ToArray());+ }+}diff --git a/src/Web/Grand.Web/wwwroot/assets/samples/logo_nordic.png b/src/Web/Grand.Web/wwwroot/assets/samples/logo_nordic.pngnew file mode 100644index 000000000..7b4e37fafBinary files /dev/null and b/src/Web/Grand.Web/wwwroot/assets/samples/logo_nordic.png differ