diff --git a/Magento_Braintree/styles/_module.scss b/Magento_Braintree/styles/_module.scss index 18af7a3c..bf60121c 100644 --- a/Magento_Braintree/styles/_module.scss +++ b/Magento_Braintree/styles/_module.scss @@ -2,16 +2,16 @@ // Variables // _____________________________________________ -$braintree-input-border__color : $color-gray76; +$braintree-input-border__color : $color-gray76 !default; -$braintree-error__color : $color-red10; -$braintree-focus__color : $color-blue2; -$braintree-success__color : $color-dark-green1; +$braintree-error__color : $color-red10 !default; +$braintree-focus__color : $color-blue2 !default; +$braintree-success__color : $color-dark-green1 !default; -$braintree-paypal-icon__height : 16px; -$braintree-paypal-icon__width : 16px; -$braintree-paypal-account__padding-right : 50px; -$braintree-paypal-account__padding-vertical : 15px; +$braintree-paypal-icon__height : 16px !default; +$braintree-paypal-icon__width : 16px !default; +$braintree-paypal-account__padding-right : 50px !default; +$braintree-paypal-account__padding-vertical : 15px !default; .payment-method-braintree { diff --git a/Magento_Catalog/styles/_module.scss b/Magento_Catalog/styles/_module.scss index 6260975a..ccba1e11 100644 --- a/Magento_Catalog/styles/_module.scss +++ b/Magento_Catalog/styles/_module.scss @@ -1,29 +1,29 @@ -$product-grid-items-per-row-layout-default : 2; +$product-grid-items-per-row-layout-default : 2 !default; -$product-grid-items-per-row-layout-1-screen-s : 3; -$product-grid-items-per-row-layout-1-screen-m : 4; -$product-grid-items-per-row-layout-1-screen-l : 5; +$product-grid-items-per-row-layout-1-screen-s : 3 !default; +$product-grid-items-per-row-layout-1-screen-m : 4 !default; +$product-grid-items-per-row-layout-1-screen-l : 5 !default; -$product-grid-items-per-row-layout-2-left-screen-s : 3; -$product-grid-items-per-row-layout-2-left-screen-m : 4; -$product-grid-items-per-row-layout-2-left-screen-l : ''; +$product-grid-items-per-row-layout-2-left-screen-s : 3 !default; +$product-grid-items-per-row-layout-2-left-screen-m : 4 !default; +$product-grid-items-per-row-layout-2-left-screen-l : '' !default; -$product-grid-items-per-row-layout-2-right-screen-s : 3; -$product-grid-items-per-row-layout-2-right-screen-m : 4; -$product-grid-items-per-row-layout-2-right-screen-l : ''; +$product-grid-items-per-row-layout-2-right-screen-s : 3 !default; +$product-grid-items-per-row-layout-2-right-screen-m : 4 !default; +$product-grid-items-per-row-layout-2-right-screen-l : '' !default; -$product-grid-items-per-row-layout-3-screen-s : 3; -$product-grid-items-per-row-layout-3-screen-m : ''; -$product-grid-items-per-row-layout-3-screen-l : ''; +$product-grid-items-per-row-layout-3-screen-s : 3 !default; +$product-grid-items-per-row-layout-3-screen-m : '' !default; +$product-grid-items-per-row-layout-3-screen-l : '' !default; -$product-grid-items-padding : 0 $indent__base $indent__base; -$product-grid-items-margin : 0 0 $indent__s; +$product-grid-items-padding : 0 $indent__base $indent__base !default; +$product-grid-items-margin : 0 0 $indent__s !default; -$product-name-text-decoration : none; -$product-name-text-decoration-hover : $link__hover__text-decoration; +$product-name-text-decoration : none !default; +$product-name-text-decoration-hover : $link__hover__text-decoration !default; -$toolbar-mode-icon-font-size : 26px; -$product-h1-margin-bottom-desktop : $indent__base; +$toolbar-mode-icon-font-size : 26px !default; +$product-h1-margin-bottom-desktop : $indent__base !default; @import 'module/listings'; @import 'module/toolbar'; diff --git a/Magento_CatalogEvent/styles/_module.scss b/Magento_CatalogEvent/styles/_module.scss index d501ccde..a4946c25 100644 --- a/Magento_CatalogEvent/styles/_module.scss +++ b/Magento_CatalogEvent/styles/_module.scss @@ -1,5 +1,5 @@ -$catalog-event-background-color : $color-gray94; -$catalog-event-color : $primary__color; +$catalog-event-background-color : $color-gray94 !default; +$catalog-event-color : $primary__color !default; // // Catalog Events diff --git a/Magento_CatalogSearch/styles/_module.scss b/Magento_CatalogSearch/styles/_module.scss index 17357064..b2155852 100644 --- a/Magento_CatalogSearch/styles/_module.scss +++ b/Magento_CatalogSearch/styles/_module.scss @@ -2,11 +2,11 @@ // Variables // _____________________________________________ -$autocomplete__background-color : $color-white; -$autocomplete__border : 1px solid $form-element-input__border-color; -$autocomplete-item__border : 1px solid $color-gray90; -$autocomplete-item__hover__color : $color-gray91; -$autocomplete-item-amount__color : $color-gray60; +$autocomplete__background-color : $color-white !default; +$autocomplete__border : 1px solid $form-element-input__border-color !default; +$autocomplete-item__border : 1px solid $color-gray90 !default; +$autocomplete-item__hover__color : $color-gray91 !default; +$autocomplete-item-amount__color : $color-gray60 !default; .block-search { margin-bottom: 0; diff --git a/Magento_Checkout/styles/module/_minicart.scss b/Magento_Checkout/styles/module/_minicart.scss index 94c47235..52e1e7c3 100644 --- a/Magento_Checkout/styles/module/_minicart.scss +++ b/Magento_Checkout/styles/module/_minicart.scss @@ -2,10 +2,10 @@ // Variables // _____________________________________________ -$minicart__border-color : $color-gray80; -$minicart__padding-horizontal : $indent__base; +$minicart__border-color : $color-gray80 !default; +$minicart__padding-horizontal : $indent__base !default; -$minicart-qty__height : 24px; +$minicart-qty__height : 24px !default; // // Minicart diff --git a/Magento_Checkout/styles/module/checkout/_authentication.scss b/Magento_Checkout/styles/module/checkout/_authentication.scss index 327c6d92..780c526e 100644 --- a/Magento_Checkout/styles/module/checkout/_authentication.scss +++ b/Magento_Checkout/styles/module/checkout/_authentication.scss @@ -2,11 +2,11 @@ // Variables // _____________________________________________ -$block-auth__dropdown__padding : $indent__m; -$block-auth__dropdown__background-color : $color-white; -$block-auth__or-label__size : 36px; -$block-auth__width : 0; -$block-auth__border : 1px solid $color-gray-light3; +$block-auth__dropdown__padding : $indent__m !default; +$block-auth__dropdown__background-color : $color-white !default; +$block-auth__or-label__size : 36px !default; +$block-auth__width : 0 !default; +$block-auth__border : 1px solid $color-gray-light3 !default; .authentication-dropdown { box-sizing: border-box; diff --git a/Magento_Checkout/styles/module/checkout/_checkout.scss b/Magento_Checkout/styles/module/checkout/_checkout.scss index a0d24589..8348a507 100644 --- a/Magento_Checkout/styles/module/checkout/_checkout.scss +++ b/Magento_Checkout/styles/module/checkout/_checkout.scss @@ -2,15 +2,15 @@ // Variables // _____________________________________________ -$checkout-wrapper__margin : $indent__base; -$checkout-wrapper__columns : 8; +$checkout-wrapper__margin : $indent__base !default; +$checkout-wrapper__columns : 8 !default; -$checkout-step-title__border : $border-width__base solid $color-gray80; -$checkout-step-title__font-size : 26px; -$checkout-step-title__font-weight : $font-weight__light; -$checkout-step-title__padding : $indent__s; +$checkout-step-title__border : $border-width__base solid $color-gray80 !default; +$checkout-step-title__font-size : 26px !default; +$checkout-step-title__font-weight : $font-weight__light !default; +$checkout-step-title__padding : $indent__s !default; -$checkout-step-title-mobile__font-size : 18px; +$checkout-step-title-mobile__font-size : 18px !default; .checkout-index-index { .page-title-wrapper { diff --git a/Magento_Checkout/styles/module/checkout/_fields.scss b/Magento_Checkout/styles/module/checkout/_fields.scss index da875ffb..7de4b27b 100644 --- a/Magento_Checkout/styles/module/checkout/_fields.scss +++ b/Magento_Checkout/styles/module/checkout/_fields.scss @@ -2,7 +2,7 @@ // Variables // _____________________________________________ -$checkout-field-validation__border-color: $form-element-validation__border-error; +$checkout-field-validation__border-color: $form-element-validation__border-error !default; .field { .control { diff --git a/Magento_Checkout/styles/module/checkout/_modals.scss b/Magento_Checkout/styles/module/checkout/_modals.scss index 34710826..f005000a 100644 --- a/Magento_Checkout/styles/module/checkout/_modals.scss +++ b/Magento_Checkout/styles/module/checkout/_modals.scss @@ -2,7 +2,7 @@ // Variables // _____________________________________________ -$checkout-modal-popup__width: 800px; +$checkout-modal-popup__width: 800px !default; .checkout-index-index { .modal-popup { diff --git a/Magento_Checkout/styles/module/checkout/_order-summary.scss b/Magento_Checkout/styles/module/checkout/_order-summary.scss index 067588da..b16a62d2 100644 --- a/Magento_Checkout/styles/module/checkout/_order-summary.scss +++ b/Magento_Checkout/styles/module/checkout/_order-summary.scss @@ -2,14 +2,14 @@ // Variables // _____________________________________________ -$checkout-summary__background-color : $color-white-smoke; -$checkout-summary__padding : 22px $indent__l; +$checkout-summary__background-color : $color-white-smoke !default; +$checkout-summary__padding : 22px $indent__l !default; -$checkout-summary-title__margin : $indent__s; -$checkout-summary-mark-value__color : $color-gray60; +$checkout-summary-title__margin : $indent__s !default; +$checkout-summary-mark-value__color : $color-gray60 !default; -$checkout-summary-items__max-height : 370px; -$checkout-summary-items__padding : 15px; +$checkout-summary-items__max-height : 370px !default; +$checkout-summary-items__padding : 15px !default; // // Order Summary diff --git a/Magento_Checkout/styles/module/checkout/_payment-options.scss b/Magento_Checkout/styles/module/checkout/_payment-options.scss index 602fb098..6d1857a5 100644 --- a/Magento_Checkout/styles/module/checkout/_payment-options.scss +++ b/Magento_Checkout/styles/module/checkout/_payment-options.scss @@ -2,18 +2,18 @@ // Variables // _____________________________________________ -$checkout-payment-option-title__border : $checkout-payment-method-title__border; -$checkout-payment-option-title__color : $link__color; -$checkout-payment-option-title__padding : $checkout-payment-method-title__padding; -$checkout-payment-option-title-mobile__padding : $checkout-payment-method-title-mobile__padding; - -$checkout-payment-option-title-icon__font-size : 32px; -$checkout-payment-option-title-icon__line-height : 16px; -$checkout-payment-option-title-icon__margin : 0; -$checkout-payment-option-title-icon__color : $minicart-icons-color; -$checkout-payment-option-title-icon__hover__color : $primary__color; - -$checkout-payment-option-content__padding__xl : $checkout-payment-method-content__padding__xl; +$checkout-payment-option-title__border : $checkout-payment-method-title__border !default; +$checkout-payment-option-title__color : $link__color !default; +$checkout-payment-option-title__padding : $checkout-payment-method-title__padding !default; +$checkout-payment-option-title-mobile__padding : $checkout-payment-method-title-mobile__padding !default; + +$checkout-payment-option-title-icon__font-size : 32px !default; +$checkout-payment-option-title-icon__line-height : 16px !default; +$checkout-payment-option-title-icon__margin : 0 !default; +$checkout-payment-option-title-icon__color : $minicart-icons-color !default; +$checkout-payment-option-title-icon__hover__color : $primary__color !default; + +$checkout-payment-option-content__padding__xl : $checkout-payment-method-content__padding__xl !default; .checkout-payment-method { .payment-option { diff --git a/Magento_Checkout/styles/module/checkout/_payments.scss b/Magento_Checkout/styles/module/checkout/_payments.scss index 56413f82..9feb172b 100644 --- a/Magento_Checkout/styles/module/checkout/_payments.scss +++ b/Magento_Checkout/styles/module/checkout/_payments.scss @@ -2,15 +2,15 @@ // Variables // _____________________________________________ -$checkout-payment-method-title__border : $checkout-shipping-method__border; -$checkout-payment-method-title__padding : $checkout-shipping-method__padding; -$checkout-payment-method-title-mobile__padding : 15px; +$checkout-payment-method-title__border : $checkout-shipping-method__border !default; +$checkout-payment-method-title__padding : $checkout-shipping-method__padding !default; +$checkout-payment-method-title-mobile__padding : 15px !default; -$checkout-payment-method-content__padding__xl : 22px; +$checkout-payment-method-content__padding__xl : 22px !default; -$checkout-billing-address-details__line-height : 27px; -$checkout-billing-address-details__padding : 0 0 0 23px; -$checkout-billing-address-form__max-width : $checkout-shipping-address__max-width; +$checkout-billing-address-details__line-height : 27px !default; +$checkout-billing-address-details__padding : 0 0 0 23px !default; +$checkout-billing-address-form__max-width : $checkout-shipping-address__max-width !default; // // Common diff --git a/Magento_Checkout/styles/module/checkout/_progress-bar.scss b/Magento_Checkout/styles/module/checkout/_progress-bar.scss index 649883bf..217ab79c 100644 --- a/Magento_Checkout/styles/module/checkout/_progress-bar.scss +++ b/Magento_Checkout/styles/module/checkout/_progress-bar.scss @@ -2,29 +2,29 @@ // Variables // _____________________________________________ -$checkout-progress-bar__font-size : 18px; -$checkout-progress-bar__font-weight : $font-weight__light; -$checkout-progress-bar__margin : $indent__base; - -$checkout-progress-bar-item__background-color : $color-gray-middle1; -$checkout-progress-bar-item__border-radius : 6px; -$checkout-progress-bar-item__color : $primary__color; -$checkout-progress-bar-item__margin : $indent__s; -$checkout-progress-bar-item__width : 185px; -$checkout-progress-bar-item__active__background-color : $color-orange-red1; -$checkout-progress-bar-item__complete__color : $link__color; - -$checkout-progress-bar-item-element__width : 38px; -$checkout-progress-bar-item-element__height : $checkout-progress-bar-item-element__width; - -$checkout-progress-bar-item-element-inner__background-color : $page__background-color; -$checkout-progress-bar-item-element-inner__color : $checkout-progress-bar-item__color; -$checkout-progress-bar-item-element-outer-radius__width : 6px; -$checkout-progress-bar-item-element-inner__width : $checkout-progress-bar-item-element__width - ($checkout-progress-bar-item-element-outer-radius__width * 2); -$checkout-progress-bar-item-element-inner__height : $checkout-progress-bar-item-element-inner__width; -$checkout-progress-bar-item-element-inner__active__content : $icon-checkmark; -$checkout-progress-bar-item-element-inner__active__font-size : 28px; -$checkout-progress-bar-item-element-inner__active__line-height : 1; +$checkout-progress-bar__font-size : 18px !default; +$checkout-progress-bar__font-weight : $font-weight__light !default; +$checkout-progress-bar__margin : $indent__base !default; + +$checkout-progress-bar-item__background-color : $color-gray-middle1 !default; +$checkout-progress-bar-item__border-radius : 6px !default; +$checkout-progress-bar-item__color : $primary__color !default; +$checkout-progress-bar-item__margin : $indent__s !default; +$checkout-progress-bar-item__width : 185px !default; +$checkout-progress-bar-item__active__background-color : $color-orange-red1 !default; +$checkout-progress-bar-item__complete__color : $link__color !default; + +$checkout-progress-bar-item-element__width : 38px !default; +$checkout-progress-bar-item-element__height : $checkout-progress-bar-item-element__width !default; + +$checkout-progress-bar-item-element-inner__background-color : $page__background-color !default; +$checkout-progress-bar-item-element-inner__color : $checkout-progress-bar-item__color !default; +$checkout-progress-bar-item-element-outer-radius__width : 6px !default; +$checkout-progress-bar-item-element-inner__width : $checkout-progress-bar-item-element__width - ($checkout-progress-bar-item-element-outer-radius__width * 2) !default; +$checkout-progress-bar-item-element-inner__height : $checkout-progress-bar-item-element-inner__width !default; +$checkout-progress-bar-item-element-inner__active__content : $icon-checkmark !default; +$checkout-progress-bar-item-element-inner__active__font-size : 28px !default; +$checkout-progress-bar-item-element-inner__active__line-height : 1 !default; // // Checkout Progress Bar diff --git a/Magento_Checkout/styles/module/checkout/_shipping-policy.scss b/Magento_Checkout/styles/module/checkout/_shipping-policy.scss index 3fe953b3..6bba278e 100644 --- a/Magento_Checkout/styles/module/checkout/_shipping-policy.scss +++ b/Magento_Checkout/styles/module/checkout/_shipping-policy.scss @@ -2,9 +2,9 @@ // Variables // _____________________________________________ -$checkout-shipping-policy-action__color : $link__color; -$checkout-shipping-policy-tooltip__width : 420px; -$checkout-shipping-policy-tooltip-mobile__width : 300px; +$checkout-shipping-policy-action__color : $link__color !default; +$checkout-shipping-policy-tooltip__width : 420px !default; +$checkout-shipping-policy-tooltip-mobile__width : 300px !default; // // Common diff --git a/Magento_Checkout/styles/module/checkout/_shipping.scss b/Magento_Checkout/styles/module/checkout/_shipping.scss index 51200903..744c722f 100644 --- a/Magento_Checkout/styles/module/checkout/_shipping.scss +++ b/Magento_Checkout/styles/module/checkout/_shipping.scss @@ -2,35 +2,35 @@ // Variables // _____________________________________________ -$checkout-shipping-address__max-width : 600px; -$checkout-shipping-address__margin-top : 28px; - -$checkout-shipping-item-icon__color : $color-white; -$checkout-shipping-item-icon__content : $icon-checkmark; - -$checkout-shipping-item__border : 2px solid transparent; -$checkout-shipping-item__line-height : 30px; -$checkout-shipping-item__margin : 0 0 $indent__base; -$checkout-shipping-item__padding : $indent__base ($indent__l + 5px) $indent__base $indent__base; -$checkout-shipping-item__transition : 0.3s border-color; -$checkout-shipping-item__width : 100% / 3; -$checkout-shipping-item-tablet__width : 100% / 2; -$checkout-shipping-item-mobile__width : 100%; -$checkout-shipping-item__active__border-color : $color-orange-red1; -$checkout-shipping-item-icon__background-color : $checkout-shipping-item__active__border-color; - -$checkout-shipping-item-icon__selected__height : 27px; -$checkout-shipping-item-icon__selected__width : 29px; - -$checkout-shipping-item-mobile__padding : 0 0 15px; -$checkout-shipping-item-mobile__margin : $checkout-shipping-item-mobile__padding; -$checkout-shipping-item-mobile__active__padding : 15px ($indent__l + 5px) 15px 18px; - -$checkout-shipping-item-before__border-color : $color-gray80; -$checkout-shipping-item-before__height : calc(100% - 20px); - -$checkout-shipping-method__border : $checkout-step-title__border; -$checkout-shipping-method__padding : $indent__base; +$checkout-shipping-address__max-width : 600px !default; +$checkout-shipping-address__margin-top : 28px !default; + +$checkout-shipping-item-icon__color : $color-white !default; +$checkout-shipping-item-icon__content : $icon-checkmark !default; + +$checkout-shipping-item__border : 2px solid transparent !default; +$checkout-shipping-item__line-height : 30px !default; +$checkout-shipping-item__margin : 0 0 $indent__base !default; +$checkout-shipping-item__padding : $indent__base ($indent__l + 5px) $indent__base $indent__base !default; +$checkout-shipping-item__transition : 0.3s border-color !default; +$checkout-shipping-item__width : 100% / 3 !default; +$checkout-shipping-item-tablet__width : 100% / 2 !default; +$checkout-shipping-item-mobile__width : 100% !default; +$checkout-shipping-item__active__border-color : $color-orange-red1 !default; +$checkout-shipping-item-icon__background-color : $checkout-shipping-item__active__border-color !default; + +$checkout-shipping-item-icon__selected__height : 27px !default; +$checkout-shipping-item-icon__selected__width : 29px !default; + +$checkout-shipping-item-mobile__padding : 0 0 15px !default; +$checkout-shipping-item-mobile__margin : $checkout-shipping-item-mobile__padding !default; +$checkout-shipping-item-mobile__active__padding : 15px ($indent__l + 5px) 15px 18px !default; + +$checkout-shipping-item-before__border-color : $color-gray80 !default; +$checkout-shipping-item-before__height : calc(100% - 20px) !default; + +$checkout-shipping-method__border : $checkout-step-title__border !default; +$checkout-shipping-method__padding : $indent__base !default; // // Common diff --git a/Magento_Checkout/styles/module/checkout/_sidebar-shipping-information.scss b/Magento_Checkout/styles/module/checkout/_sidebar-shipping-information.scss index e1101c47..e43027e5 100644 --- a/Magento_Checkout/styles/module/checkout/_sidebar-shipping-information.scss +++ b/Magento_Checkout/styles/module/checkout/_sidebar-shipping-information.scss @@ -2,15 +2,15 @@ // Variables // _____________________________________________ -$checkout-sidebar-shipping-information__padding : $indent__l; -$checkout-sidebar-shipping-information__line-height : $checkout-billing-address-details__line-height; - -$checkout-sidebar-shipping-information-edit-icon__color : $minicart-icons-color; -$checkout-sidebar-shipping-information-edit-icon__content : $icon-settings; -$checkout-sidebar-shipping-information-edit-icon__font-size : 28px; -$checkout-sidebar-shipping-information-edit-icon__line-height : 28px; -$checkout-sidebar-shipping-information-edit-icon__top : 2px; -$checkout-sidebar-shipping-information-edit-icon__hover__color : $primary__color; +$checkout-sidebar-shipping-information__padding : $indent__l !default; +$checkout-sidebar-shipping-information__line-height : $checkout-billing-address-details__line-height !default; + +$checkout-sidebar-shipping-information-edit-icon__color : $minicart-icons-color !default; +$checkout-sidebar-shipping-information-edit-icon__content : $icon-settings !default; +$checkout-sidebar-shipping-information-edit-icon__font-size : 28px !default; +$checkout-sidebar-shipping-information-edit-icon__line-height : 28px !default; +$checkout-sidebar-shipping-information-edit-icon__top : 2px !default; +$checkout-sidebar-shipping-information-edit-icon__hover__color : $primary__color !default; // // Shipping Information diff --git a/Magento_Checkout/styles/module/checkout/_sidebar.scss b/Magento_Checkout/styles/module/checkout/_sidebar.scss index dc26c1a9..8e6982d2 100644 --- a/Magento_Checkout/styles/module/checkout/_sidebar.scss +++ b/Magento_Checkout/styles/module/checkout/_sidebar.scss @@ -2,9 +2,9 @@ // Variables // _____________________________________________ -$checkout-sidebar__margin: $indent__base; -$checkout-sidebar__margin__xl: 46px; -$checkout-sidebar__columns: 4; +$checkout-sidebar__margin: $indent__base !default; +$checkout-sidebar__margin__xl: 46px !default; +$checkout-sidebar__columns: 4 !default; // // Desktop diff --git a/Magento_Checkout/styles/module/checkout/_tooltip.scss b/Magento_Checkout/styles/module/checkout/_tooltip.scss index e606fd3f..7530eac8 100644 --- a/Magento_Checkout/styles/module/checkout/_tooltip.scss +++ b/Magento_Checkout/styles/module/checkout/_tooltip.scss @@ -2,28 +2,28 @@ // Variables // _____________________________________________ -$checkout-tooltip__hover__z-index : $tooltip__z-index; -$checkout-tooltip-breakpoint__screen-m : $modal-popup-breakpoint-screen__m; - -$checkout-tooltip-icon-arrow__font-size : 10px; -$checkout-tooltip-icon-arrow__left : -( $checkout-tooltip-content__padding + $checkout-tooltip-icon-arrow__font-size - $checkout-tooltip-content__border-width); - -$checkout-tooltip-icon__color : $color-gray-light2; -$checkout-tooltip-icon__content : $icon-help; -$checkout-tooltip-icon__font-size : 24px; -$checkout-tooltip-icon__hover__color : $primary__color; - -$checkout-tooltip-content__background-color : $color-gray-light01; -$checkout-tooltip-content__border-color : $color-gray60; -$checkout-tooltip-content__border-width : 1px; -$checkout-tooltip-content__font-size : $font-size__base; -$checkout-tooltip-content__padding : 12px; -$checkout-tooltip-content__width : 270px; -$checkout-tooltip-content__active__border-color : darken($checkout-tooltip-content__border-color, 20%); - -$checkout-tooltip-content-mobile-popup__width : 200px; -$checkout-tooltip-content-mobile__right : -($indent__s); -$checkout-tooltip-content-mobile__top : 30px + $checkout-tooltip-icon-arrow__font-size; +$checkout-tooltip__hover__z-index : $tooltip__z-index !default; +$checkout-tooltip-breakpoint__screen-m : $modal-popup-breakpoint-screen__m !default; + +$checkout-tooltip-icon-arrow__font-size : 10px !default; +$checkout-tooltip-icon-arrow__left : -( $checkout-tooltip-content__padding + $checkout-tooltip-icon-arrow__font-size - $checkout-tooltip-content__border-width) !default; + +$checkout-tooltip-icon__color : $color-gray-light2 !default; +$checkout-tooltip-icon__content : $icon-help !default; +$checkout-tooltip-icon__font-size : 24px !default; +$checkout-tooltip-icon__hover__color : $primary__color !default; + +$checkout-tooltip-content__background-color : $color-gray-light01 !default; +$checkout-tooltip-content__border-color : $color-gray60 !default; +$checkout-tooltip-content__border-width : 1px !default; +$checkout-tooltip-content__font-size : $font-size__base !default; +$checkout-tooltip-content__padding : 12px !default; +$checkout-tooltip-content__width : 270px !default; +$checkout-tooltip-content__active__border-color : darken($checkout-tooltip-content__border-color, 20%) !default; + +$checkout-tooltip-content-mobile-popup__width : 200px !default; +$checkout-tooltip-content-mobile__right : -($indent__s) !default; +$checkout-tooltip-content-mobile__top : 30px + $checkout-tooltip-icon-arrow__font-size !default; // // Common diff --git a/Magento_Cms/styles/_widgets.scss b/Magento_Cms/styles/_widgets.scss index 328db67f..4858314c 100644 --- a/Magento_Cms/styles/_widgets.scss +++ b/Magento_Cms/styles/_widgets.scss @@ -1,4 +1,4 @@ -$widgets-indent__bottom: $indent__base; +$widgets-indent__bottom: $indent__base !default; .block-static-block, .block-cms-link { diff --git a/Magento_Customer/styles/_module.scss b/Magento_Customer/styles/_module.scss index fc4d3fae..74d41c52 100644 --- a/Magento_Customer/styles/_module.scss +++ b/Magento_Customer/styles/_module.scss @@ -2,23 +2,23 @@ // Variables // _____________________________________________ -$account-nav-background : $sidebar__background-color; -$account-nav-color : false; +$account-nav-background : $sidebar__background-color !default; +$account-nav-color : false !default; -$account-nav-current-border : 3px solid transparent; -$account-nav-current-border-color : $color-orange-red1; -$account-nav-current-color : false; -$account-nav-current-font-weight : $font-weight__semibold; +$account-nav-current-border : 3px solid transparent !default; +$account-nav-current-border-color : $color-orange-red1 !default; +$account-nav-current-color : false !default; +$account-nav-current-font-weight : $font-weight__semibold !default; -$account-nav-delimiter__border-color : $color-gray82; +$account-nav-delimiter__border-color : $color-gray82 !default; -$account-nav-item-hover : $color-gray91; +$account-nav-item-hover : $color-gray91 !default; -$_password-default : $color-gray-light01; -$_password-weak : #ffafae; -$_password-medium : #ffd6b3; -$_password-strong : #c5eeac; -$_password-very-strong : #81b562; +$_password-default : $color-gray-light01 !default; +$_password-weak : #ffafae !default; +$_password-medium : #ffd6b3 !default; +$_password-strong : #c5eeac !default; +$_password-very-strong : #81b562 !default; .login-container { .block { diff --git a/Magento_GiftMessage/styles/_module.scss b/Magento_GiftMessage/styles/_module.scss index b09b69b1..4f6ba70d 100644 --- a/Magento_GiftMessage/styles/_module.scss +++ b/Magento_GiftMessage/styles/_module.scss @@ -2,9 +2,9 @@ // Variables // _____________________________________________ -$gift-message-field-label__color : $color-gray40; -$gift-item-block__border-color : $color-gray-light5; -$gift-item-block__border-width : $border-width__base; +$gift-message-field-label__color : $color-gray40 !default; +$gift-item-block__border-color : $color-gray-light5 !default; +$gift-item-block__border-width : $border-width__base !default; .gift-message { .field { diff --git a/Magento_GiftWrapping/styles/_module.scss b/Magento_GiftWrapping/styles/_module.scss index 778a02ee..4abe4ab3 100644 --- a/Magento_GiftWrapping/styles/_module.scss +++ b/Magento_GiftWrapping/styles/_module.scss @@ -2,18 +2,18 @@ // Variables // _____________________________________________ -$gift-wrapping__border-color : $color-gray-light5; -$gift-wrapping__border-width : $border-width__base; +$gift-wrapping__border-color : $color-gray-light5 !default; +$gift-wrapping__border-width : $border-width__base !default; -$gift-wrapping-preview__active__border-color : $color-gray20; -$gift-wrapping-preview__active__border-width : 3px; +$gift-wrapping-preview__active__border-color : $color-gray20 !default; +$gift-wrapping-preview__active__border-width : 3px !default; -$gift-wrapping-thumbnail__height : 4rem; -$gift-wrapping-thumbnail__width : $gift-wrapping-thumbnail__height; +$gift-wrapping-thumbnail__height : 4rem !default; +$gift-wrapping-thumbnail__width : $gift-wrapping-thumbnail__height !default; -$gift-wrapping-no-image__background : $color-gray95; -$gift-wrapping-no-image-icon__color : $color-gray-darken4; -$gift-wrapping-no-image-icon__font-size : 38px; +$gift-wrapping-no-image__background : $color-gray95 !default; +$gift-wrapping-no-image-icon__color : $color-gray-darken4 !default; +$gift-wrapping-no-image-icon__font-size : 38px !default; .gift-wrapping { .label { diff --git a/Magento_MultipleWishlist/styles/_module.scss b/Magento_MultipleWishlist/styles/_module.scss index 15f2566d..7b53c0ef 100644 --- a/Magento_MultipleWishlist/styles/_module.scss +++ b/Magento_MultipleWishlist/styles/_module.scss @@ -1,7 +1,7 @@ -$desktop-popup-width : 380px; -$desktop-popup-margin-left : -(($desktop-popup-width + ($popup__padding * 2)) / 2); -$desktop-popup-position-left : 50%; -$desktop-popup-position-top : 20%; +$desktop-popup-width : 380px !default; +$desktop-popup-margin-left : -(($desktop-popup-width + ($popup__padding * 2)) / 2) !default; +$desktop-popup-position-left : 50% !default; +$desktop-popup-position-top : 20% !default; .wishlist { // Wish list split button diff --git a/Magento_Review/styles/_module.scss b/Magento_Review/styles/_module.scss index b4c8f1bc..ae4934ed 100644 --- a/Magento_Review/styles/_module.scss +++ b/Magento_Review/styles/_module.scss @@ -2,8 +2,8 @@ // Variables // _____________________________________________ -$review-ratings-left: 280px; -$reviews-indent-desktop: 30px; +$review-ratings-left: 280px !default; +$reviews-indent-desktop: 30px !default; .rating-summary { @include lib-rating-summary(); diff --git a/Magento_Theme/styles/_module.scss b/Magento_Theme/styles/_module.scss index aa47c688..620b18e9 100644 --- a/Magento_Theme/styles/_module.scss +++ b/Magento_Theme/styles/_module.scss @@ -3,39 +3,39 @@ // _____________________________________________ // Messages -$message-global-note__background : $color-yellow-light2; -$message-global-note__border-color : $color-yellow-light3; -$message-global-note__color : $text__color; +$message-global-note__background : $color-yellow-light2 !default; +$message-global-note__border-color : $color-yellow-light3 !default; +$message-global-note__color : $text__color !default; -$message-global-note-link__color : $link__color; -$message-global-note-link__color-hover : $link__hover__color; -$message-global-note-link__color-active : $link__active__color; +$message-global-note-link__color : $link__color !default; +$message-global-note-link__color-hover : $link__hover__color !default; +$message-global-note-link__color-active : $link__active__color !default; -$message-global-caution__background : $color-red9; -$message-global-caution__border-color : none; -$message-global-caution__color : $color-white; +$message-global-caution__background : $color-red9 !default; +$message-global-caution__border-color : none !default; +$message-global-caution__color : $color-white !default; -$message-global-caution-link__color : $link__color; -$message-global-caution-link__color-hover : $link__hover__color; -$message-global-caution-link__color-active : $link__active__color; +$message-global-caution-link__color : $link__color !default; +$message-global-caution-link__color-hover : $link__hover__color !default; +$message-global-caution-link__color-active : $link__active__color !default; // Header -$header__background-color : false; -$header-icons-color : $color-gray56; -$header-icons-color-hover : $color-gray20; +$header__background-color : false !default; +$header-icons-color : $color-gray56 !default; +$header-icons-color-hover : $color-gray20 !default; -$addto-color : $text__color__muted; -$addto-hover-color : $primary__color; +$addto-color : $text__color__muted !default; +$addto-hover-color : $primary__color !default; -$minicart-icons-color : $header-icons-color; -$minicart-icons-color-hover : $header-icons-color-hover; +$minicart-icons-color : $header-icons-color !default; +$minicart-icons-color-hover : $header-icons-color-hover !default; -$button__shadow : inset 0 2px 1px rgba(0, 0, 0, 0.12); +$button__shadow : inset 0 2px 1px rgba(0, 0, 0, 0.12) !default; -$h1__margin-bottom__desktop : $indent__xl; +$h1__margin-bottom__desktop : $indent__xl !default; // Footer -$footer__background-color : false; +$footer__background-color : false !default; body { diff --git a/styles/blocks/_forms.scss b/styles/blocks/_forms.scss index ec593636..218b662e 100644 --- a/styles/blocks/_forms.scss +++ b/styles/blocks/_forms.scss @@ -2,8 +2,8 @@ // Variables // _____________________________________________ -$form-field__vertical-indent__desktop: 29px; -$form-calendar-icon__color: $primary__color; +$form-field__vertical-indent__desktop: 29px !default; +$form-calendar-icon__color: $primary__color !default; .fieldset { @include lib-form-fieldset(); diff --git a/styles/blocks/_layout.scss b/styles/blocks/_layout.scss index 780e814f..6eb2215c 100644 --- a/styles/blocks/_layout.scss +++ b/styles/blocks/_layout.scss @@ -1,5 +1,5 @@ -$layout-column-main__sidebar-offset : 2%; -$layout-column__additional-sidebar-offset : $layout-column-main__sidebar-offset; +$layout-column-main__sidebar-offset : 2% !default; +$layout-column__additional-sidebar-offset : $layout-column-main__sidebar-offset !default; .columns { @include lib-layout-columns(); diff --git a/styles/blocks/_navigation.scss b/styles/blocks/_navigation.scss index 1a10e391..510d5cc0 100644 --- a/styles/blocks/_navigation.scss +++ b/styles/blocks/_navigation.scss @@ -2,7 +2,7 @@ // Variables // _____________________________________________ -$active-nav-indent: 54px; +$active-nav-indent: 54px !default; .panel.header { .links, diff --git a/styles/blocks/_popups.scss b/styles/blocks/_popups.scss index a8b2de30..9cb50600 100644 --- a/styles/blocks/_popups.scss +++ b/styles/blocks/_popups.scss @@ -2,7 +2,7 @@ // Variables // _____________________________________________ -$popup-marker__size: 7px; +$popup-marker__size: 7px !default; // Popup working with dropdown dialog .ui-dialog { diff --git a/styles/blocks/components/_modals.scss b/styles/blocks/components/_modals.scss index 7972a9bb..1da1ce87 100644 --- a/styles/blocks/components/_modals.scss +++ b/styles/blocks/components/_modals.scss @@ -6,28 +6,28 @@ // Variables // --------------------------------------------- -$modal__background-color : $color-white; -$modal__box-shadow : 0 0 12px 2px rgba(0, 0, 0, 0.35); +$modal__background-color : $color-white !default; +$modal__box-shadow : 0 0 12px 2px rgba(0, 0, 0, 0.35) !default; -$modal-popup__indent-vertical : 5rem; -$modal-popup__padding : 3rem; -$modal-popup__width : 75%; -$modal-popup__z-index : $modal__z-index; +$modal-popup__indent-vertical : 5rem !default; +$modal-popup__padding : 3rem !default; +$modal-popup__width : 75% !default; +$modal-popup__z-index : $modal__z-index !default; -$modal-slide__first__indent-left : 14.8rem; -$modal-slide__indent-left : 4.5rem; -$modal-slide__padding : 2.6rem; -$modal-slide__z-index : $modal__z-index; +$modal-slide__first__indent-left : 14.8rem !default; +$modal-slide__indent-left : 4.5rem !default; +$modal-slide__padding : 2.6rem !default; +$modal-slide__z-index : $modal__z-index !default; -$modal-slide-header__padding-vertical : 2.1rem; +$modal-slide-header__padding-vertical : 2.1rem !default; -$modal-popup-confirm__width : 50rem; +$modal-popup-confirm__width : 50rem !default; -$modal-popup-image-box__border-color : $color-gray80; -$modal-popup-image-box__max-width : 78rem; +$modal-popup-image-box__border-color : $color-gray80 !default; +$modal-popup-image-box__max-width : 78rem !default; -$modal-popup-image-box-preview-image__max-height : 54rem; -$modal-popup-image-box-preview__max-width : calc(#{$modal-popup-image-box-preview-image__max-height} + #{(2 * $indent__base)}); +$modal-popup-image-box-preview-image__max-height : 54rem !default; +$modal-popup-image-box-preview__max-width : calc(#{$modal-popup-image-box-preview-image__max-height} + #{(2 * $indent__base)}) !default; // // Utilities diff --git a/styles/blocks/components/_modals_extend.scss b/styles/blocks/components/_modals_extend.scss index 49891dee..424be6a2 100644 --- a/styles/blocks/components/_modals_extend.scss +++ b/styles/blocks/components/_modals_extend.scss @@ -6,22 +6,22 @@ // Variables // --------------------------------------------- -$modal-title__color : $text__color; -$modal-title__border : 1px solid $color-gray-light5; +$modal-title__color : $text__color !default; +$modal-title__border : 1px solid $color-gray-light5 !default; -$modal-popup-title__font-size : 26px; -$modal-popup-title-mobile__font-size : $font-size__base; -$modal-popup-breakpoint-screen__m : $screen__m; +$modal-popup-title__font-size : 26px !default; +$modal-popup-title-mobile__font-size : $font-size__base !default; +$modal-popup-breakpoint-screen__m : $screen__m !default; -$modal-slide__first__indent-left : 44px; -$modal-slide-mobile__background-color : $color-gray-light01; -$modal-overlay__background-color : fade($color-gray20, 55%); +$modal-slide__first__indent-left : 44px !default; +$modal-slide-mobile__background-color : $color-gray-light01 !default; +$modal-overlay__background-color : fade($color-gray20, 55%) !default; -$modal-action-close__color : $primary__color; -$modal-action-close__font-size : 32px; -$modal-action-close__hover__color : darken($primary__color, 10%); +$modal-action-close__color : $primary__color !default; +$modal-action-close__font-size : 32px !default; +$modal-action-close__hover__color : darken($primary__color, 10%) !default; -$modal-slide-action-close__padding : $modal-slide-header__padding-vertical - 1rem $modal-popup__padding - 1rem; +$modal-slide-action-close__padding : $modal-slide-header__padding-vertical - 1rem $modal-popup__padding - 1rem !default; // // Common