diff --git a/feature-libs/cart/base/styles/components/_item-counter.scss b/feature-libs/cart/base/styles/components/_item-counter.scss index 4199a2f88d4..0ed9f1ab3e8 100644 --- a/feature-libs/cart/base/styles/components/_item-counter.scss +++ b/feature-libs/cart/base/styles/components/_item-counter.scss @@ -30,10 +30,6 @@ border: solid 1px var(--cx-color-light); display: inline-flex; - @include forFeature('santoriniV2') { - border: solid 1px var(--cx-color-dark); - } - input { border: solid 1px var(--cx-color-light); border-width: 0 1px; @@ -41,17 +37,10 @@ max-height: 48px; min-width: 46%; max-width: 46%; + &:focus { background: var(--cx-color-background); } - - @include forFeature('santoriniV2') { - border-color: var(--cx-color-dark); - &:focus { - background-color: var(--cx-color-transparent); - box-shadow: 0 0 0 0; - } - } } } @@ -80,18 +69,6 @@ &:disabled { color: var(--cx-color-light); } - - @include forFeature('santoriniV2') { - font-size: var(--cx-font-size, 2rem); - line-height: 0; - color: var(--cx-color-text); - &:focus { - box-shadow: 0 0 0 0; - } - &:disabled { - color: var(--cx-color-dark); - } - } } :disabled { diff --git a/feature-libs/cart/base/styles/components/_mini-cart.scss b/feature-libs/cart/base/styles/components/_mini-cart.scss index 602c29490f8..e50fbd71f3d 100644 --- a/feature-libs/cart/base/styles/components/_mini-cart.scss +++ b/feature-libs/cart/base/styles/components/_mini-cart.scss @@ -27,10 +27,6 @@ padding-inline-start: 7px; font-size: var(--cx-font-size, 1.188rem); font-weight: var(--cx-font-weight-bold); - - @include forFeature('santoriniV2') { - @include type('3'); - } } .total { diff --git a/feature-libs/cart/quick-order/styles/_quick-order-form.scss b/feature-libs/cart/quick-order/styles/_quick-order-form.scss index dba91483ea8..3f445becf98 100644 --- a/feature-libs/cart/quick-order/styles/_quick-order-form.scss +++ b/feature-libs/cart/quick-order/styles/_quick-order-form.scss @@ -27,10 +27,6 @@ position: absolute; right: 6px; top: 4px; - - @include forFeature('santoriniV2') { - color: var(--cx-color-secondary); - } } .quick-order-form-reset-icon { diff --git a/feature-libs/organization/administration/styles/_form.scss b/feature-libs/organization/administration/styles/_form.scss index 511385548ec..84715cb2aed 100644 --- a/feature-libs/organization/administration/styles/_form.scss +++ b/feature-libs/organization/administration/styles/_form.scss @@ -47,10 +47,6 @@ padding-inline-start: 30px; font-size: 16px; font-weight: normal; - - @include forFeature('santoriniV2') { - @include type('6'); - } } } } diff --git a/feature-libs/pickup-in-store/styles/_my-preferred-store.scss b/feature-libs/pickup-in-store/styles/_my-preferred-store.scss index 03818e70d0a..23620a6890a 100644 --- a/feature-libs/pickup-in-store/styles/_my-preferred-store.scss +++ b/feature-libs/pickup-in-store/styles/_my-preferred-store.scss @@ -26,10 +26,6 @@ margin-top: 1rem; margin-bottom: 0; color: var(--cx-color-primary); - - @include forFeature('santoriniV2') { - @include type('2'); - } } [data-test-id='preferredStoreAddressBook'] .cx-store-name { font-weight: 700; diff --git a/integration-libs/s4om/styles/schedule-lines.scss b/integration-libs/s4om/styles/schedule-lines.scss index 6c7223ad3ec..9b604a6d94c 100644 --- a/integration-libs/s4om/styles/schedule-lines.scss +++ b/integration-libs/s4om/styles/schedule-lines.scss @@ -11,10 +11,6 @@ cx-schedule-lines { font-weight: var(--cx-font-weight-normal); font-size: var(--cx-font-size, 1rem); padding-inline-end: 0.313rem; - - @include forFeature('santoriniV2') { - @include type('7'); - } } .cx-value { diff --git a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts index 9ecf9466858..660fbdea755 100644 --- a/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts +++ b/projects/core/src/features-config/feature-toggles/config/feature-toggles.ts @@ -238,11 +238,6 @@ export interface FeatureTogglesInterface { * will be fully visible */ a11yCloseProductImageBtnFocus?: boolean; - - /** - * Enables the updated Santorini theme. - */ - santoriniV2?: boolean; } export const defaultFeatureToggles: Required = { @@ -285,5 +280,4 @@ export const defaultFeatureToggles: Required = { a11yTruncatedTextForResponsiveView: false, a11yMyAccountLinkOutline: false, a11yCloseProductImageBtnFocus: false, - santoriniV2: false, }; diff --git a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts index ee6b47f0a1d..c9f30841b1d 100644 --- a/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts +++ b/projects/storefrontapp/src/app/spartacus/spartacus-features.module.ts @@ -76,7 +76,6 @@ import { CheckoutFeatureModule } from './features/checkout/checkout-feature.modu import { CustomerTicketingFeatureModule } from './features/customer-ticketing/customer-ticketing-feature.module'; import { DigitalPaymentsFeatureModule } from './features/digital-payments/digital-payments-feature.module'; import { EpdVisualizationFeatureModule } from './features/epd-visualization/epd-visualization-feature.module'; -import { EstimatedDeliveryDateFeatureModule } from './features/estimated-delivery-date/estimated-delivery-date-feature.module'; import { OppsFeatureModule } from './features/opps/opps-feature.module'; import { OrderFeatureModule } from './features/order/order-feature.module'; import { AccountSummaryFeatureModule } from './features/organization/organization-account-summary-feature.module'; @@ -95,6 +94,7 @@ import { QualtricsFeatureModule } from './features/qualtrics/qualtrics-feature.m import { QuoteFeatureModule } from './features/quote-feature.module'; import { OrganizationUserRegistrationFeatureModule } from './features/registration-feature.module'; import { RequestedDeliveryDateFeatureModule } from './features/requested-delivery-date/requested-delivery-date-feature.module'; +import { EstimatedDeliveryDateFeatureModule } from './features/estimated-delivery-date/estimated-delivery-date-feature.module'; import { S4OMFeatureModule } from './features/s4om/s4om-feature.module'; import { SegmentRefsFeatureModule } from './features/segment-refs/segment-refs-feature.module'; import { SmartEditFeatureModule } from './features/smartedit/smartedit-feature.module'; @@ -308,7 +308,6 @@ if (environment.estimatedDeliveryDate) { a11yTruncatedTextForResponsiveView: true, a11yMyAccountLinkOutline: true, a11yCloseProductImageBtnFocus: true, - santoriniV2: true, }; return appFeatureToggles; }), diff --git a/projects/storefrontlib/layout/main/storefront.component.ts b/projects/storefrontlib/layout/main/storefront.component.ts index ab058a252df..e38fab56a6d 100644 --- a/projects/storefrontlib/layout/main/storefront.component.ts +++ b/projects/storefrontlib/layout/main/storefront.component.ts @@ -13,7 +13,7 @@ import { OnInit, ViewChild, } from '@angular/core'; -import { RoutingService, useFeatureStyles } from '@spartacus/core'; +import { RoutingService } from '@spartacus/core'; import { Observable, Subscription } from 'rxjs'; import { FocusConfig, @@ -61,9 +61,7 @@ export class StorefrontComponent implements OnInit, OnDestroy { private routingService: RoutingService, protected elementRef: ElementRef, protected keyboardFocusService: KeyboardFocusService - ) { - useFeatureStyles('santoriniV2'); - } + ) {} ngOnInit(): void { this.navigateSubscription = this.routingService diff --git a/projects/storefrontstyles/scss/_theme.scss b/projects/storefrontstyles/scss/_theme.scss index 4e6ba0043eb..ffc125e6223 100644 --- a/projects/storefrontstyles/scss/_theme.scss +++ b/projects/storefrontstyles/scss/_theme.scss @@ -4,10 +4,5 @@ //point to the theme variables //@import 'theme/sparta/variables'; -//@import "theme/lambda/variables"; - -//old theme to be commented out on next major or with impex @import 'theme/santorini/variables'; - -// new theme below to uncomment on next major or with impex -// @import 'theme/santorini-updated/variables'; +//@import "theme/lambda/variables"; diff --git a/projects/storefrontstyles/scss/components/content/banner/_banner.scss b/projects/storefrontstyles/scss/components/content/banner/_banner.scss index 7b8414b8ee9..0f63d29ae5c 100644 --- a/projects/storefrontstyles/scss/components/content/banner/_banner.scss +++ b/projects/storefrontstyles/scss/components/content/banner/_banner.scss @@ -24,12 +24,6 @@ } } - @include forFeature('santoriniV2') { - cx-media { - color: black; - } - } - .no-link { display: block; } diff --git a/projects/storefrontstyles/scss/components/content/media/_media.scss b/projects/storefrontstyles/scss/components/content/media/_media.scss index 177a1c31b61..78b25ffaeb6 100644 --- a/projects/storefrontstyles/scss/components/content/media/_media.scss +++ b/projects/storefrontstyles/scss/components/content/media/_media.scss @@ -20,9 +20,4 @@ background: no-repeat top center url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" version="1.1" id="Layer_1" viewBox="0 0 515 515" xml:space="preserve"%3E%3Cstyle type="text/css"%3E.st0%7Bfill:%23FFFFFF;%7D.st1%7Bfill:%23D3D6DB;%7D%3C/style%3E%3Crect y="0" class="st0" width="515" height="515"/%3E%3Cpath class="st1" d="M352.6,198.7h-31.9v15.6h31.9V198.7z M279.3,293.6c-5.9,5.2-14.8,8.1-23,8.1c-22.2,0-39.3-17.8-39.3-40 c0-1.5,0-3.7,0-5.2L279.3,293.6z M296.3,261.7c0,2.2,0,5.2,0,5.9l-64.4-37.8c7.4-5.2,15.6-8.9,24.4-8.9 C278.6,221.7,296.3,240.2,296.3,261.7z M129.7,204.7v120c0,8.9,5.9,15.6,15.6,15.6h214.1l-65.9-37.8c-9.6,8.9-23,14.8-37.8,14.8 c-30.4,0-54.8-25.9-54.8-55.6c0-5.2,0-9.6,1.5-13.3L129.7,204.7z M115.6,170.6L406,341.7l5.2,2.2l-2.2,5.9l-2.2,2.2l-2.2,5.9 l-5.9-3.7L108.9,183.2l-5.9-3.7l3.7-5.2l1.5-2.2l3.7-5.9L115.6,170.6z M206.7,181.7l-1.5-9.6c-1.5-2.2-2.2-3.7-5.2-3.7h-15.6h-14.8 c-2.2,0-3.7,1.5-5.2,3.7l-2.2,9.6h-1.5h-11.9l68.1,40c9.6-9.6,24.4-15.6,39.3-15.6c31.9,0,55.6,25.2,55.6,55.6 c0,5.2-1.5,9.6-2.2,14.8l74.1,43.7V198.7c0-9.6-7.4-17-15.6-17h-15.6c-5.2-1.5-8.9-5.2-11.1-8.9l-2.2-3.7 c-3.7-5.9-11.9-11.1-18.5-11.1h-45.2c-7.4,0-15.6,5.2-19.3,11.1l-3.7,5.2c-2.2,2.2-5.9,5.9-9.6,7.4h-23h-11.1H206.7L206.7,181.7z"/%3E%3C/svg%3E'); background-size: contain; - - @include forFeature('santoriniV2') { - background: no-repeat top center - url('data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" version="1.1" id="Layer_1" viewBox="0 0 515 515" xml:space="preserve"%3E%3Cstyle type="text/css"%3E.st0%7Bfill:%23FFFFFF;%7D.st1%7Bfill:%2377818B;%7D%3C/style%3E%3Crect y="0" class="st0" width="515" height="515"/%3E%3Cpath class="st1" d="M352.6,198.7h-31.9v15.6h31.9V198.7z M279.3,293.6c-5.9,5.2-14.8,8.1-23,8.1c-22.2,0-39.3-17.8-39.3-40 c0-1.5,0-3.7,0-5.2L279.3,293.6z M296.3,261.7c0,2.2,0,5.2,0,5.9l-64.4-37.8c7.4-5.2,15.6-8.9,24.4-8.9 C278.6,221.7,296.3,240.2,296.3,261.7z M129.7,204.7v120c0,8.9,5.9,15.6,15.6,15.6h214.1l-65.9-37.8c-9.6,8.9-23,14.8-37.8,14.8 c-30.4,0-54.8-25.9-54.8-55.6c0-5.2,0-9.6,1.5-13.3L129.7,204.7z M115.6,170.6L406,341.7l5.2,2.2l-2.2,5.9l-2.2,2.2l-2.2,5.9 l-5.9-3.7L108.9,183.2l-5.9-3.7l3.7-5.2l1.5-2.2l3.7-5.9L115.6,170.6z M206.7,181.7l-1.5-9.6c-1.5-2.2-2.2-3.7-5.2-3.7h-15.6h-14.8 c-2.2,0-3.7,1.5-5.2,3.7l-2.2,9.6h-1.5h-11.9l68.1,40c9.6-9.6,24.4-15.6,39.3-15.6c31.9,0,55.6,25.2,55.6,55.6 c0,5.2-1.5,9.6-2.2,14.8l74.1,43.7V198.7c0-9.6-7.4-17-15.6-17h-15.6c-5.2-1.5-8.9-5.2-11.1-8.9l-2.2-3.7 c-3.7-5.9-11.9-11.1-18.5-11.1h-45.2c-7.4,0-15.6,5.2-19.3,11.1l-3.7,5.2c-2.2,2.2-5.9,5.9-9.6,7.4h-23h-11.1H206.7L206.7,181.7z"/%3E%3C/svg%3E'); - } } diff --git a/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss b/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss index 2b955e10b98..455f8f2152a 100644 --- a/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss +++ b/projects/storefrontstyles/scss/components/content/navigation/_breadcrumb.scss @@ -17,10 +17,6 @@ html[dir='rtl'] cx-breadcrumb nav span:not(:last-child):after { box-shadow: none; } - @include forFeature('santoriniV2') { - color: var(--cx-color-text); - } - h1 { white-space: nowrap; overflow: hidden; @@ -38,13 +34,9 @@ html[dir='rtl'] cx-breadcrumb nav span:not(:last-child):after { } nav { - @include forFeature('santoriniV2') { - // complements reboot to remove focus-ring from unfocused elements - &[tabindex='-1']:focus { - box-shadow: 0 0 0 0 !important; - } - } + font-size: var(--cx-font-size, 0.875rem); padding: 5px 0; + display: flex; justify-content: center; @@ -71,10 +63,6 @@ html[dir='rtl'] cx-breadcrumb nav span:not(:last-child):after { text-transform: capitalize; color: inherit; padding: 0px 5px; - - @include forFeature('santoriniV2') { - color: var(--cx-color-primary); - } } } } diff --git a/projects/storefrontstyles/scss/components/content/navigation/_footer-navigation.scss b/projects/storefrontstyles/scss/components/content/navigation/_footer-navigation.scss index fd84fb828a2..d41f3913740 100644 --- a/projects/storefrontstyles/scss/components/content/navigation/_footer-navigation.scss +++ b/projects/storefrontstyles/scss/components/content/navigation/_footer-navigation.scss @@ -2,11 +2,6 @@ background-color: var(--cx-color-background-dark); a { font-size: var(--cx-font-small, 0.8rem); - - @include forFeature('santoriniV2') { - @include type('8'); - } - &:hover { color: var(--cx-color-inverse); text-decoration: underline; @@ -35,11 +30,5 @@ margin: 3vw; } } - - @include forFeature('santoriniV2') { - nav ul.childs > li > cx-generic-link > a:hover { - color: var(--cx-color-inverse); - } - } } } diff --git a/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss b/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss index c0fc856f0d5..3eb7009610e 100644 --- a/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss +++ b/projects/storefrontstyles/scss/components/content/navigation/_navigation-ui.scss @@ -93,12 +93,6 @@ color: var(--cx-color-primary); } - @include forFeature('santoriniV2') { - &:hover { - color: var(--cx-color-text); - } - } - &:focus { z-index: 1; position: relative; @@ -114,18 +108,6 @@ } } - @include forFeature('santoriniV2') { - // arrow down caret to stay white on desktop - // adding outline to convey button's definition - button:hover { - color: var(--cx-color-inverse); - outline: 1px solid var(--cx-color-inverse); - } - cx-generic-link:hover { - color: var(--cx-color-inverse); - } - } - @include media-breakpoint-down(md) { // make all first level headings uppercase in mobile view > nav > ul > li { @@ -148,6 +130,7 @@ border-bottom: 1px solid var(--cx-color-medium); display: flex; justify-content: space-between; + cursor: pointer; } @@ -155,14 +138,6 @@ button, cx-generic-link a { padding: 1rem; - - @include forFeature('santoriniV2') { - // adjust style for mobile menu, has diff background colour - &:hover { - color: var(--cx-color-primary); - outline: 0; - } - } } } @@ -176,15 +151,6 @@ padding-bottom: 22px; padding-inline-start: 0; padding-inline-end: 0; - @include forFeature('santoriniV2') { - margin-top: 2px; - margin-bottom: 2px; - margin-inline-start: 5px; - padding-top: 18px; - padding-bottom: 20px; - padding-inline-end: 8px; - padding-inline-start: 8px; - } } // first level headings will be bold in desktop ul > li > span, @@ -221,22 +187,6 @@ ul.childs > li > cx-generic-link > a { padding: 5px 0; } - @include forFeature('santoriniV2') { - li > cx-generic-link > a { - padding-top: 10px; - padding-bottom: 12px; - padding-inline-start: 0; - margin-top: 10px; - margin-bottom: 10px; - } - ul.childs > li > button:hover { - color: var(--cx-color-text); - } - ul.childs > li > cx-generic-link > a:hover { - color: var(--cx-color-text); - text-decoration: underline; - } - } } } @@ -252,10 +202,6 @@ &:before { font-size: 1rem; } - - @include forFeature('santoriniV2') { - padding-inline-start: 0; - } } } } @@ -272,12 +218,6 @@ padding: 0; } } - - @include forFeature('santoriniV2') { - cx-generic-link:hover { - color: var(--cx-color-text); - } - } } } } @@ -292,12 +232,6 @@ text-decoration: none; white-space: nowrap; } - @include forFeature('santoriniV2') { - a:hover { - color: var(--cx-color-inverse); - text-decoration: underline; - } - } } } @@ -449,14 +383,6 @@ &.accNavComponent { background-color: transparent; - @include forFeature('santoriniV2') { - // my account button has text, this fixes white hover on desktop - button:hover { - color: var(--cx-color-primary); - outline: 0; - } - } - nav { li.is-open { @include media-breakpoint-down(md) { diff --git a/projects/storefrontstyles/scss/components/content/pdf/_pdf.scss b/projects/storefrontstyles/scss/components/content/pdf/_pdf.scss index 7713b6ad57c..cda5226ed9e 100644 --- a/projects/storefrontstyles/scss/components/content/pdf/_pdf.scss +++ b/projects/storefrontstyles/scss/components/content/pdf/_pdf.scss @@ -2,18 +2,11 @@ .pdf-container { padding-top: 0.938rem; font-size: var(--cx-font-size, 0.875rem); - @include forFeature('santoriniV2') { - @include type('7'); - } a { color: var(--cx-color-text); line-height: 1.1875rem; text-decoration: underline; font-weight: 600; - - @include forFeature('santoriniV2') { - @include type('3'); - } } cx-icon { margin-inline-start: 0.3rem; diff --git a/projects/storefrontstyles/scss/components/content/tab-paragraph-container/_tab-paragraph-container.scss b/projects/storefrontstyles/scss/components/content/tab-paragraph-container/_tab-paragraph-container.scss index bc0e66be037..77c4ba21971 100644 --- a/projects/storefrontstyles/scss/components/content/tab-paragraph-container/_tab-paragraph-container.scss +++ b/projects/storefrontstyles/scss/components/content/tab-paragraph-container/_tab-paragraph-container.scss @@ -4,7 +4,6 @@ $useAccordionOnly: false !default; @mixin accordion { > button { border-top: 1px var(--cx-color-light) solid; - font-size: var(--cx-font-size, 1.188rem); padding-top: 15px; padding-inline-end: 0; @@ -14,16 +13,6 @@ $useAccordionOnly: false !default; text-align: start; height: 63px; position: relative; - - @include forFeature('santoriniV2') { - @include type('3'); - border-top: 1px solid var(--cx-color-medium); - - &:focus { - box-shadow: 0 0 0 0; - } - } - > span.accordion-icon { &:before { content: '+'; diff --git a/projects/storefrontstyles/scss/components/layout/_storefront.scss b/projects/storefrontstyles/scss/components/layout/_storefront.scss index 79a5c77d25a..0d8202ff4dd 100644 --- a/projects/storefrontstyles/scss/components/layout/_storefront.scss +++ b/projects/storefrontstyles/scss/components/layout/_storefront.scss @@ -30,10 +30,6 @@ :focus, .ng-select-focused { --cx-visual-focus-width: 0; - @include forFeature('santoriniV2') { - // this change is not kicking-in, minor issue, it does work work when unwraping, unwrap in next major - box-shadow: 0 0 0 0; - } } } } diff --git a/projects/storefrontstyles/scss/components/layout/header/_header.scss b/projects/storefrontstyles/scss/components/layout/header/_header.scss index 243272b44f3..e4dc0183d8e 100644 --- a/projects/storefrontstyles/scss/components/layout/header/_header.scss +++ b/projects/storefrontstyles/scss/components/layout/header/_header.scss @@ -78,10 +78,6 @@ $space: 0.5rem; flex: none; } justify-content: flex-start; - - @include forFeature('santoriniV2') { - @include type('8'); - } } .SiteLinks { diff --git a/projects/storefrontstyles/scss/components/misc/chat-messaging/_avatar.scss b/projects/storefrontstyles/scss/components/misc/chat-messaging/_avatar.scss index b0338f16dc6..c3764652ffe 100644 --- a/projects/storefrontstyles/scss/components/misc/chat-messaging/_avatar.scss +++ b/projects/storefrontstyles/scss/components/misc/chat-messaging/_avatar.scss @@ -9,11 +9,6 @@ display: flex; border: 1px solid var(--cx-color-light); font-size: var(--cx-font-size, 2rem); - - @include forFeature('santoriniV2') { - @include type('1'); - border: 1px solid var(--cx-color-medium); - } } .right-align { diff --git a/projects/storefrontstyles/scss/components/misc/chat-messaging/_messaging.scss b/projects/storefrontstyles/scss/components/misc/chat-messaging/_messaging.scss index 4aa2b9d528f..db4fcbac5e8 100644 --- a/projects/storefrontstyles/scss/components/misc/chat-messaging/_messaging.scss +++ b/projects/storefrontstyles/scss/components/misc/chat-messaging/_messaging.scss @@ -25,10 +25,6 @@ label { margin-bottom: 0; font-size: var(--cx-font-size, 0.875rem); - - @include forFeature('santoriniV2') { - @include type('4'); - } } .cx-message-card { @@ -142,10 +138,6 @@ font-style: italic; text-align: end; margin: 0; - - @include forFeature('santoriniV2') { - @include type('8'); - } } } } diff --git a/projects/storefrontstyles/scss/components/misc/pagination/_pagination.scss b/projects/storefrontstyles/scss/components/misc/pagination/_pagination.scss index df5a7e47f4d..2982950f92a 100644 --- a/projects/storefrontstyles/scss/components/misc/pagination/_pagination.scss +++ b/projects/storefrontstyles/scss/components/misc/pagination/_pagination.scss @@ -5,50 +5,31 @@ align-content: center; align-items: stretch; - @include forFeature('santoriniV2') { - align-items: center; - } - a { color: var(--cx-color-text); width: 48px; height: 46px; font-size: var(--cx-font-size, 1.188rem); + border: solid 1px var(--cx-color-light); box-sizing: content-box; + border-inline-end: none; + display: flex; align-items: center; justify-content: center; - transition: background-color 0.3s, color 0.3s; - @include forFeature('santoriniV2') { - @include type('7'); - border: solid 1px var(--cx-color-medium); - } + transition: background-color 0.3s, color 0.3s; &:first-child { border-top-left-radius: 0.25rem; border-bottom-left-radius: 0.25rem; - - @include forFeature('santoriniV2') { - color: var(--cx-color-secondary); - font-size: var(--cx-font-size, 2rem); - line-height: 0; - } } - &:last-child { border-inline-end: solid 1px var(--cx-color-light); border-top-right-radius: 0.25rem; border-bottom-right-radius: 0.25rem; - - @include forFeature('santoriniV2') { - border-inline-end: solid 1px var(--cx-color-medium); - color: var(--cx-color-secondary); - font-size: var(--cx-font-size, 2rem); - line-height: 0; - } } &.current { diff --git a/projects/storefrontstyles/scss/components/misc/popover/_popover.scss b/projects/storefrontstyles/scss/components/misc/popover/_popover.scss index c88eb7c249e..e08d9907a31 100644 --- a/projects/storefrontstyles/scss/components/misc/popover/_popover.scss +++ b/projects/storefrontstyles/scss/components/misc/popover/_popover.scss @@ -29,11 +29,6 @@ border-radius: var(--cx-popover-border-radius); padding: 1rem 0.938rem; box-shadow: 0px 1px 11px 2px var(--cx-popover-box-shadow-color); - - @include forFeature('santoriniV2') { - @include type('7'); - } - > .arrow { position: absolute; display: block; diff --git a/projects/storefrontstyles/scss/components/misc/progress-button/_progress-button.scss b/projects/storefrontstyles/scss/components/misc/progress-button/_progress-button.scss index d16c3e83808..c58086da620 100644 --- a/projects/storefrontstyles/scss/components/misc/progress-button/_progress-button.scss +++ b/projects/storefrontstyles/scss/components/misc/progress-button/_progress-button.scss @@ -14,10 +14,6 @@ font-size: var(--cx-font-size, 1.188rem); font-weight: var(--cx-font-weight-bold); - @include forFeature('santoriniV2') { - @include type('4'); - } - .loader-container { position: relative; margin-inline-end: 10px; diff --git a/projects/storefrontstyles/scss/components/myaccount/_my-coupons-card.scss b/projects/storefrontstyles/scss/components/myaccount/_my-coupons-card.scss index bfdab3f5923..74d5195372f 100644 --- a/projects/storefrontstyles/scss/components/myaccount/_my-coupons-card.scss +++ b/projects/storefrontstyles/scss/components/myaccount/_my-coupons-card.scss @@ -120,9 +120,5 @@ button.cx-card-read-more { font-size: 1rem; - - @include forFeature('santoriniV2') { - @include type('8'); - } } } diff --git a/projects/storefrontstyles/scss/components/myaccount/_my-interests.scss b/projects/storefrontstyles/scss/components/myaccount/_my-interests.scss index 028eb05e320..dffdf6dc935 100644 --- a/projects/storefrontstyles/scss/components/myaccount/_my-interests.scss +++ b/projects/storefrontstyles/scss/components/myaccount/_my-interests.scss @@ -94,10 +94,6 @@ @include type('8'); font-size: var(--cx-font-size, 1.188rem); font-weight: var(--cx-font-weight-bold); - - @include forFeature('santoriniV2') { - @include type('6'); - } } .cx-product-interests-notification { diff --git a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss index 88515480e93..759fee08932 100644 --- a/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss +++ b/projects/storefrontstyles/scss/components/myaccount/anonymous-consent/_anonymous-consent-open-dialog.scss @@ -9,13 +9,7 @@ .btn-link { padding: 0; color: var(--cx-color-inverse); - font-size: 0.875rem; - - @include forFeature('santoriniV2') { - @include type('8'); - color: var(--cx-color-inverse); - } - + font-size: 0.8rem; &:not(:hover) { text-decoration: none; } diff --git a/projects/storefrontstyles/scss/components/product/list/_active-facets.scss b/projects/storefrontstyles/scss/components/product/list/_active-facets.scss index 293c9f99c34..9b7a0e7dcf6 100644 --- a/projects/storefrontstyles/scss/components/product/list/_active-facets.scss +++ b/projects/storefrontstyles/scss/components/product/list/_active-facets.scss @@ -25,10 +25,6 @@ font-size: var(--cx-font-size, 0.92rem); background: var(--cx-color-background); - @include forFeature('santoriniV2') { - @include type('7'); - } - &:hover { background: var(--cx-color-light); color: var(--cx-color-primary); diff --git a/projects/storefrontstyles/scss/components/product/list/_facet.scss b/projects/storefrontstyles/scss/components/product/list/_facet.scss index cfc32e1a9cf..eb3d2d15df1 100644 --- a/projects/storefrontstyles/scss/components/product/list/_facet.scss +++ b/projects/storefrontstyles/scss/components/product/list/_facet.scss @@ -5,16 +5,16 @@ $intialExpandedFacetsLarge: 3 !default; display: flex; align-items: center; justify-content: space-between; + margin: 0.4rem 0; padding: 0.4rem; width: 100%; + border-bottom: 1px solid var(--cx-color-light); + cursor: pointer; - font-weight: var(--cx-font-weight-semi); - @include forFeature('santoriniV2') { - border-bottom: 1px solid var(--cx-color-medium); - } + font-weight: var(--cx-font-weight-semi); &:hover, &:focus { @@ -156,21 +156,23 @@ $intialExpandedFacetsLarge: 3 !default; &::before { content: '✓'; color: transparent; + flex-shrink: 0; + font-size: 1rem; font-weight: bold; + width: 1.3rem; height: 1.35rem; + border-radius: 0.2rem; border: solid 1px var(--cx-color-light); + display: flex; justify-content: center; align-items: center; - margin-inline-end: 0.5rem; - @include forFeature('santoriniV2') { - border: solid 2px var(--cx-color-text); - } + margin-inline-end: 0.5rem; } &.selected::before { diff --git a/projects/storefrontstyles/scss/components/product/list/_product-list.scss b/projects/storefrontstyles/scss/components/product/list/_product-list.scss index f6a9e328b5e..459d12cf4ee 100644 --- a/projects/storefrontstyles/scss/components/product/list/_product-list.scss +++ b/projects/storefrontstyles/scss/components/product/list/_product-list.scss @@ -10,10 +10,6 @@ border-color: var(--cx-color-light); margin: 0 0 25px 0; - @include forFeature('santoriniV2') { - border-color: var(--cx-color-medium); - } - &:last-of-type { border: none; } @@ -27,10 +23,6 @@ border-style: solid; border-color: var(--cx-color-light); - @include forFeature('santoriniV2') { - border-color: var(--cx-color-medium); - } - @include media-breakpoint-down(md) { border: none; } diff --git a/projects/storefrontstyles/scss/components/product/list/_product-view.scss b/projects/storefrontstyles/scss/components/product/list/_product-view.scss index d688ada30d1..a7a49dcd750 100644 --- a/projects/storefrontstyles/scss/components/product/list/_product-view.scss +++ b/projects/storefrontstyles/scss/components/product/list/_product-view.scss @@ -9,10 +9,6 @@ border-radius: 4px; border: 1px solid var(--cx-color-light); - @include forFeature('santoriniV2') { - border: 1px solid var(--cx-color-dark); - } - &.cx-product-grid { .fas { font-size: 24px; diff --git a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss index 256f9aaf231..2c9f2261ffe 100644 --- a/projects/storefrontstyles/scss/components/product/search/_searchbox.scss +++ b/projects/storefrontstyles/scss/components/product/search/_searchbox.scss @@ -136,10 +136,6 @@ @include placeholder { color: currentColor; - - @include forFeature('santoriniV2') { - color: var(--cx-color-dark); - } } } @@ -157,10 +153,6 @@ padding: 6px; color: var(--cx-color-medium); - @include forFeature('santoriniV2') { - color: var(--cx-color-secondary); - } - @include media-breakpoint-down(sm) { color: var(--cx-color-primary); font-size: var(--cx-font-size, 1.563rem); @@ -191,10 +183,6 @@ background-color: #fff; font-size: var(--cx-font-small, 1rem); - @include forFeature('santoriniV2') { - @include type('8'); - } - @include media-breakpoint-down(sm) { top: 105px; z-index: 10; @@ -277,20 +265,12 @@ font-size: inherit; font-weight: inherit; - @include forFeature('santoriniV2') { - @include type('8'); - } - // Required for text-overflow to do anything white-space: nowrap; overflow: hidden; } .price { font-weight: normal; - - @include forFeature('santoriniV2') { - @include type('8'); - } } } } diff --git a/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss b/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss index 3f00cbb47dd..4cb88467034 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/accordion.scss @@ -13,11 +13,6 @@ font-size: $font-size-base * 1.375; font-weight: 600; color: theme-color('text'); - - @include forFeature('santoriniV2') { - @include type('3'); - } - .btn { text-align: start; text-decoration: none !important; diff --git a/projects/storefrontstyles/scss/cxbase/blocks/alert.scss b/projects/storefrontstyles/scss/cxbase/blocks/alert.scss index 88505265d0c..27fe138a723 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/alert.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/alert.scss @@ -18,10 +18,6 @@ display: flex; justify-content: center; - @include media-breakpoint-down(sm) { - @include type('6'); - } - &-icon { height: var(--cx-height, 25px); margin-inline-end: var(--cx-margin-right, spacer(2)); diff --git a/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss b/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss index a22c2ea3e97..26cd8299da7 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/buttons.scss @@ -31,10 +31,6 @@ button { min-width: 48px; border-radius: var(--cx-buttons-border-radius); - @include forFeature('santoriniV2') { - @include type('4'); - } - &-sm { padding-top: 0; padding-bottom: 0; @@ -62,9 +58,6 @@ button { background-color: var(--cx-color-primary); border-color: var(--cx-color-primary); @include cx-darken(88); - @include forFeature('santoriniV2') { - filter: none; - } } &.disabled, @@ -89,11 +82,6 @@ button { border-color: var(--cx-color-primary); @include cx-lighten(88); - @include forFeature('santoriniV2') { - background-color: var(--cx-color-primary-accent); - filter: none; - } - &:focus { box-shadow: 0 0 0 0.2rem rgba(var(--cx-color-primary), 0.5); } @@ -164,11 +152,6 @@ button { .focus { border-radius: 4px; } - - @include forFeature('santoriniV2') { - @include type('6'); - color: var(--cx-color-primary); - } } } @@ -180,10 +163,6 @@ button { font-size: var(--cx-font-size, 1rem); width: auto; - @include forFeature('santoriniV2') { - @include type('6'); - } - &:hover { background-color: var(--cx-color-transparent); color: var(--cx-color-primary-accent); diff --git a/projects/storefrontstyles/scss/cxbase/blocks/forms.scss b/projects/storefrontstyles/scss/cxbase/blocks/forms.scss index 75bab4bd20b..6f3d078e02e 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/forms.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/forms.scss @@ -10,31 +10,6 @@ box-shadow: none; -webkit-box-shadow: none; } - - @include forFeature('santoriniV2') { - border: 1px solid var(--cx-color-dark); - - &:focus { - border-color: var(--cx-color-text); - background-color: var(--cx-color-inverse); - } - - &::placeholder { - color: var(--cx-color-secondary); - } - - &::-webkit-input-placeholder { - color: var(--cx-color-secondary); - } - - &:-ms-input-placeholder { - color: var(--cx-color-secondary); - } - - &::-ms-input-placeholder { - color: var(--cx-color-secondary); - } - } } cx-form-errors { @@ -45,10 +20,6 @@ cx-form-errors { position: relative; word-break: break-word; - @include forFeature('santoriniV2') { - @include type('7'); - } - &::before, &::after { position: absolute; @@ -212,10 +183,6 @@ legend { border-width: 2px; border-color: var(--cx-color-medium); - @include forFeature('santoriniV2') { - border-color: var(--cx-color-text); - } - &:checked { font-style: normal; border-color: var(--cx-color-primary); @@ -243,9 +210,6 @@ legend { .form-control[type='text'] { &:focus { background-color: var(--cx-color-background); - @include forFeature('santoriniV2') { - background-color: var(--cx-color-inverse); - } box-shadow: none; -webkit-box-shadow: none; } @@ -259,10 +223,6 @@ input[type='radio'] { border-color: var(--cx-color-medium); position: absolute; - @include forFeature('santoriniV2') { - border-color: var(--cx-color-text); - } - &::after { content: ''; position: absolute; @@ -303,13 +263,6 @@ input[type='radio'] { .ng-dropdown-panel-items { .ng-option.ng-option-marked { background-color: var(--cx-color-light); - @include forFeature('santoriniV2') { - outline: 2px solid var(--cx-color-visual-focus); - margin-top: 2px; - margin-bottom: 2px; - margin-inline-start: 2px; - margin-inline-end: 2px; - } } } } @@ -326,9 +279,6 @@ input[type='radio'] { padding: 0.6875rem 0; line-height: 1.6; height: unset; - @include forFeature('santoriniV2') { - border: 1px solid var(--cx-color-dark); - } .ng-value-container { padding-inline-start: 10px; @@ -404,12 +354,8 @@ input { .form-group { input[type='text']::placeholder, input[type='tel']::placeholder { - color: var(--cx-color-secondary); + color: var(--cx-color-text); opacity: 1; - - @include forFeature('santoriniV2') { - color: var(--cx-color-secondary); - } } input[type='text']:-ms-input-placeholder, diff --git a/projects/storefrontstyles/scss/cxbase/blocks/message.scss b/projects/storefrontstyles/scss/cxbase/blocks/message.scss index 3b19b4a8cd2..cbdd010937e 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/message.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/message.scss @@ -28,10 +28,6 @@ padding-top: 0; position: relative; text-align: var(--cx-text-align, center); - - @include forFeature('santoriniV2') { - @include type('6'); - } } &-text { @@ -54,10 +50,6 @@ font-size: var(--cx-font-size, 0.8125rem); font-weight: var(--cx-font-weight-normal); padding: 0 12px; - - @include forFeature('santoriniV2') { - @include type('8'); - } } &-icon { diff --git a/projects/storefrontstyles/scss/cxbase/blocks/paragraph.scss b/projects/storefrontstyles/scss/cxbase/blocks/paragraph.scss index 44a9553f45a..bf416e1b693 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/paragraph.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/paragraph.scss @@ -5,8 +5,4 @@ color: var(--cx-color-dark); background-color: var(--cx-color-inverse); margin-bottom: -1.5rem; - - @include forFeature('santoriniV2') { - color: var(--cx-color-text); - } } diff --git a/projects/storefrontstyles/scss/cxbase/blocks/tables.scss b/projects/storefrontstyles/scss/cxbase/blocks/tables.scss index c9b8c2b9056..d2523b532fb 100644 --- a/projects/storefrontstyles/scss/cxbase/blocks/tables.scss +++ b/projects/storefrontstyles/scss/cxbase/blocks/tables.scss @@ -13,10 +13,6 @@ font-weight: $font-weight-semi; text-transform: uppercase; color: theme-color('secondary'); - - @include forFeature('santoriniV2') { - @include type('6'); - } } } diff --git a/projects/storefrontstyles/scss/cxbase/mixins/_visible-focus.scss b/projects/storefrontstyles/scss/cxbase/mixins/_visible-focus.scss index 57963d3c357..a284490d9a3 100644 --- a/projects/storefrontstyles/scss/cxbase/mixins/_visible-focus.scss +++ b/projects/storefrontstyles/scss/cxbase/mixins/_visible-focus.scss @@ -4,16 +4,6 @@ outline-width: var(--cx-visual-focus-width, 2px); outline-offset: 4px; transition: none; - @include forFeature('santoriniV2') { - // !important statement not optimal, remove when possible - // overrides bootstrap styles and specific feature flag adjustments - // box-shadow reset was added .mouse-focus in storefront.scss - outline-style: solid; - outline-color: var(--cx-color-visual-focus); - outline-width: var(--cx-visual-focus-width, 2px); - outline-offset: 2px !important; - box-shadow: 0 0 0 2px var(--cx-color-inverse); - } // TODO: (CXSPA-7208) Remove feature flag next major @include forFeature('a11yVisibleFocusOverflows') { z-index: 1000; diff --git a/projects/storefrontstyles/scss/layout/page-templates/_common-template.scss b/projects/storefrontstyles/scss/layout/page-templates/_common-template.scss index 04ec2c683fa..6903944c0ca 100644 --- a/projects/storefrontstyles/scss/layout/page-templates/_common-template.scss +++ b/projects/storefrontstyles/scss/layout/page-templates/_common-template.scss @@ -20,11 +20,7 @@ cx-page-layout { } &.footer { - background-color: var(--cx-color-dark); - @include forFeature('santoriniV2') { - background-color: var(--cx-color-secondary); - } - + background-color: var(--cx-background-color, var(--cx-color-dark)); color: var(--cx-color, var(--cx-color-inverse)); } } diff --git a/projects/storefrontstyles/scss/misc/_table.scss b/projects/storefrontstyles/scss/misc/_table.scss index 2d8ecdf5ebe..3e5cc9ce1d0 100644 --- a/projects/storefrontstyles/scss/misc/_table.scss +++ b/projects/storefrontstyles/scss/misc/_table.scss @@ -32,10 +32,6 @@ font-size: var(--cx-font-size, 0.875rem); white-space: nowrap; - @include forFeature('santoriniV2') { - @include type('6'); - } - &:nth-last-of-type(1) { padding-inline-end: 16px; } diff --git a/projects/storefrontstyles/scss/theme/santorini-updated/_fonts.scss b/projects/storefrontstyles/scss/theme/santorini-updated/_fonts.scss deleted file mode 100644 index 669e05f7584..00000000000 --- a/projects/storefrontstyles/scss/theme/santorini-updated/_fonts.scss +++ /dev/null @@ -1 +0,0 @@ -@import url('#{$font-url}'); diff --git a/projects/storefrontstyles/scss/theme/santorini-updated/_variables.scss b/projects/storefrontstyles/scss/theme/santorini-updated/_variables.scss deleted file mode 100644 index 4a7466319d0..00000000000 --- a/projects/storefrontstyles/scss/theme/santorini-updated/_variables.scss +++ /dev/null @@ -1,156 +0,0 @@ -// SANTORINI v0.1 -// This file is for theme configuration. These variables are used in global and component CSS files. -// -// You can: -// 1) Set new values for Bootstrap variables - https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss -// 2) Set new values for cxbase variables - cxbase/_variables.scss -// 3) Set new values for component variables - app/__/_.scss -// You cannot: -// 1) Add new variables -@import '../../cxbase/functions'; - -//fonts (see _fonts.scss to import) -$font-family-sans-serif: 'Open Sans', -apple-system, BlinkMacSystemFont, - 'Segoe UI', 'Roboto', 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', - 'Segoe UI Emoji', 'Segoe UI Symbol'; - -// TODO: Replace `$font-url` with swap url in 5.0 to use swap strategy by default. -// $font-url: 'https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700&display=swap' !default; -$font-url: 'https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700' !default; - -// change theme-colors here -$primary: #055f9f !default; -$primary-accent: #0f4880 !default; -$secondary: #556b82 !default; -$success: #256f3a !default; -$success-accent: #f0fbe4 !default; -$danger: #aa0808 !default; -$danger-accent: #fff1f1 !default; -$warning: #b44f00 !default; -$warning-accent: #fff5df !default; -$info: #0064d8 !default; -$info-accent: #deeffe !default; -$light: #f1f1f1 !default; -$medium: #d3d6db !default; -$dark: #77818b !default; -$background: #f4f4f4 !default; -$background-dark: #212738 !default; -$inverse: #ffffff !default; -$text: #14293a !default; -$transparent: transparent !default; -$visual-focus: #1f3a93 !default; -$background-focus: rgba(80, 176, 244, 0.1); -$border-focus: rgba(166, 204, 232, 0.6); - -$theme-colors: ( - 'primary': $primary, - 'primary-accent': $primary-accent, - 'secondary': $secondary, - 'success': $success, - 'success-accent': $success-accent, - 'danger': $danger, - 'danger-accent': $danger-accent, - 'warning': $warning, - 'warning-accent': $warning-accent, - 'info': $info, - 'info-accent': $info-accent, - 'light': $light, - 'medium': $medium, - 'dark': $dark, - 'background': $background, - 'background-dark': $background-dark, - 'inverse': $inverse, - 'text': $text, - 'transparent': $transparent, - 'visual-focus': $visual-focus, - 'background-focus': $background-focus, - 'border-focus': $border-focus, -); - -//type — https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss#L225 -$font-size-base: 1rem !default; ///////////// 16px -$h1-font-size: $font-size-base * 2; ///////// 32px -$h2-font-size: $font-size-base * 1.5; /////// 24px -$h3-font-size: $font-size-base * 1.375; ///// 22px -$h4-font-size: $font-size-base; ///////////// 16px -$h5-font-size: $font-size-base; ///////////// 16px -$small-font-size: $font-size-base * 0.875; // 14px - -$font-weight-light: 'light'; -$font-weight-normal: 'normal'; -$font-weight-semi: 'semi'; -$font-weight-bold: 'bold'; - -//update type size and weights -$type: ( - '1': $h1-font-size $font-weight-semi, - '2': $h2-font-size $font-weight-semi, - '3': $h3-font-size $font-weight-semi, - '4': $font-size-base $font-weight-semi, - '5': $font-size-base $font-weight-semi, - '6': $font-size-base $font-weight-semi, - '7': $font-size-base $font-weight-normal, - '8': $small-font-size $font-weight-semi, -); - -//bring in variable defaults -@import '../../cxbase/variables'; - -// GLOBAL VARIABLE OVERRIDES -// These can be set with anything above or any variables exposed in Bootsrap or cxbase -$grid-gutter-width: 30px; - -$line-height-base: 1.6; -$headings-line-height: 1.222222222222222; - -$paragraph-margin-bottom: 1.5rem; -$border-radius: 0.25rem; - -$btn-padding-y: 14px; - -$input-height: 48px; -$input-btn-focus-box-shadow: none; -$input-padding-y: 0.6875rem; -$custom-select-padding-y: $input-padding-y; -$label-margin-bottom: 0.375rem; -$alert-padding-y: 20px; -$alert-border-radius: 0; - -$input-placeholder-color: lighten($body-color, 50); -$input-border-color: theme-color('light'); -$input-focus-border-color: theme-color('dark'); -$input-focus-bg: theme-color('background'); - -$custom-select-bg: color('white'); -$custom-select-border-color: $input-border-color; -$body-color: $text; -$body-bg: $inverse; - -//remove variables -$colors: map-remove( - $colors, - 'indigo', - 'purple', - 'pink', - 'orange', - 'teal', - 'cyan', - 'gray-dark', - 'gray', - 'blue', - 'red', - 'yellow', - 'green', - 'white' -); - -// COMPONENT VARIABLE OVERRIDES -// For example, the following would override the cx-storefront background set -// in src/app/ui/layout/main/main.component.scss -// $cx-storefront-background-color: "info"; -$spinWhileLoading: true !default; -$spinWhileWaiting: true !default; -$zoomThumbOnHover: true !default; -$overlayWhileLoading: true !default; -$useTabsOnPDP: true !default; -$useAccordionOnly: true !default;