Revert "Feature: New Santorini theme fixes contrast issues with new c…

…olours" (SAP#18906)
crisli001 · May 27, 2024 · cc0fe68 · cc0fe68
1 parent 527a8f4
commit cc0fe68
Show file tree

Hide file tree

Showing 44 changed files with 25 additions and 580 deletions.
diff --git a/feature-libs/cart/base/styles/components/_item-counter.scss b/feature-libs/cart/base/styles/components/_item-counter.scss
@@ -30,28 +30,17 @@
     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;
       padding: 12px 9px;
       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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -238,11 +238,6 @@ export interface FeatureTogglesInterface {
    * will be fully visible
    */
   a11yCloseProductImageBtnFocus?: boolean;
-
-  /**
-   * Enables the updated Santorini theme.
-   */
-  santoriniV2?: boolean;
 }
 
 export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
@@ -285,5 +280,4 @@ export const defaultFeatureToggles: Required<FeatureTogglesInterface> = {
   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
@@ -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
@@ -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<HTMLElement>,
     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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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);
-      }
-    }
   }
 }