Skip to content
This repository has been archived by the owner on Jan 16, 2025. It is now read-only.

Commit

Permalink
Add default flag to all variables defined inside Magento_Checkout (#180)
Browse files Browse the repository at this point in the history 
* Add default flag to all variables defined inside Magento_Checkout

* Add default flag to all variables
  • Loading branch information
@Igloczek
dnsv authored and Igloczek committed Mar 27, 2018
1 parent 227c806 commit 6804203
Show file tree
Hide file tree
Showing 31 changed files with 253 additions and 253 deletions.
16 changes: 8 additions & 8 deletions Magento_Braintree/styles/_module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
38 changes: 19 additions & 19 deletions Magento_Catalog/styles/_module.scss
View file
Original file line number Diff line number Diff line change
@@ -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';
Expand Down
4 changes: 2 additions & 2 deletions Magento_CatalogEvent/styles/_module.scss
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions Magento_CatalogSearch/styles/_module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions Magento_Checkout/styles/module/_minicart.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions Magento_Checkout/styles/module/checkout/_authentication.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 7 additions & 7 deletions Magento_Checkout/styles/module/checkout/_checkout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Magento_Checkout/styles/module/checkout/_fields.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion Magento_Checkout/styles/module/checkout/_modals.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Variables
// _____________________________________________

$checkout-modal-popup__width: 800px;
$checkout-modal-popup__width: 800px !default;

.checkout-index-index {
.modal-popup {
Expand Down
12 changes: 6 additions & 6 deletions Magento_Checkout/styles/module/checkout/_order-summary.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 12 additions & 12 deletions Magento_Checkout/styles/module/checkout/_payment-options.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions Magento_Checkout/styles/module/checkout/_payments.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
46 changes: 23 additions & 23 deletions Magento_Checkout/styles/module/checkout/_progress-bar.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Magento_Checkout/styles/module/checkout/_shipping-policy.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
58 changes: 29 additions & 29 deletions Magento_Checkout/styles/module/checkout/_shipping.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 6804203

Please sign in to comment.