Skip to content

Commit

Permalink
Merge pull request #1475 from capsula4/checkout-font
Browse files Browse the repository at this point in the history 
CHECKOUT-4039 Checkout UI Refresh
  • Loading branch information
@lpschz
lpschz authored Apr 17, 2019
2 parents 7939b23 + d3159e3 commit c7b95c5
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 27 deletions.
2 changes: 1 addition & 1 deletion assets/scss/optimized-checkout.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ a {
.optimizedCheckout-orderSummary {
background-color: stencilColor("optimizedCheckout-orderSummary-backgroundColor");
border-color: stencilColor("optimizedCheckout-orderSummary-borderColor");
box-shadow: 0 1px 4px transparentize(stencilColor("optimizedCheckout-orderSummary-borderColor"), 0.4);
box-shadow: 0 4px 8px transparentize(stencilColor("optimizedCheckout-orderSummary-borderColor"), 0.5);
}

.optimizedCheckout-orderSummary-cartSection {
Expand Down
36 changes: 18 additions & 18 deletions config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,23 +229,23 @@
"optimizedCheckout-logo-size": "250x100",
"optimizedCheckout-logo-position": "left",
"optimizedCheckout-headingPrimary-color": "#333333",
"optimizedCheckout-headingPrimary-font": "Google_Montserrat_400",
"optimizedCheckout-headingPrimary-font": "Google_Montserrat_700",
"optimizedCheckout-headingSecondary-color": "#333333",
"optimizedCheckout-headingSecondary-font": "Google_Montserrat_400",
"optimizedCheckout-headingSecondary-font": "Google_Montserrat_700",
"optimizedCheckout-body-backgroundColor": "#ffffff",
"optimizedCheckout-colorFocus": "#4496f6",
"optimizedCheckout-contentPrimary-color": "#333333",
"optimizedCheckout-contentPrimary-font": "Google_Karla_400",
"optimizedCheckout-contentPrimary-font": "Google_Montserrat_500",
"optimizedCheckout-contentSecondary-color": "#757575",
"optimizedCheckout-contentSecondary-font": "Google_Karla_400",
"optimizedCheckout-buttonPrimary-font": "Google_Karla_400",
"optimizedCheckout-contentSecondary-font": "Google_Montserrat_500",
"optimizedCheckout-buttonPrimary-font": "Google_Montserrat_500",
"optimizedCheckout-buttonPrimary-color": "#ffffff",
"optimizedCheckout-buttonPrimary-colorHover": "#ffffff",
"optimizedCheckout-buttonPrimary-colorActive": "#ffffff",
"optimizedCheckout-buttonPrimary-backgroundColor": "#333333",
"optimizedCheckout-buttonPrimary-backgroundColorHover": "#666666",
"optimizedCheckout-buttonPrimary-backgroundColorActive": "#000000",
"optimizedCheckout-buttonPrimary-borderColor": "#cccccc",
"optimizedCheckout-buttonPrimary-borderColor": "#333333",
"optimizedCheckout-buttonPrimary-borderColorHover": "transparent",
"optimizedCheckout-buttonPrimary-borderColorActive": "transparent",
"optimizedCheckout-buttonPrimary-borderColorDisabled": "transparent",
Expand All @@ -255,7 +255,7 @@
"optimizedCheckout-formChecklist-color": "#333333",
"optimizedCheckout-formChecklist-borderColor": "#cccccc",
"optimizedCheckout-formChecklist-backgroundColorSelected": "#f5f5f5",
"optimizedCheckout-buttonSecondary-font": "Google_Karla_400",
"optimizedCheckout-buttonSecondary-font": "Google_Montserrat_500",
"optimizedCheckout-buttonSecondary-color": "#333333",
"optimizedCheckout-buttonSecondary-colorHover": "#333333",
"optimizedCheckout-buttonSecondary-colorActive": "#000000",
Expand All @@ -266,7 +266,7 @@
"optimizedCheckout-buttonSecondary-borderColorHover": "#999999",
"optimizedCheckout-buttonSecondary-borderColorActive": "#757575",
"optimizedCheckout-link-color": "#476bef",
"optimizedCheckout-link-font": "Google_Karla_400",
"optimizedCheckout-link-font": "Google_Montserrat_500",
"optimizedCheckout-discountBanner-backgroundColor": "#e5e5e5",
"optimizedCheckout-discountBanner-textColor": "#333333",
"optimizedCheckout-discountBanner-iconColor": "#333333",
Expand All @@ -277,7 +277,7 @@
"optimizedCheckout-form-textColor": "#666666",
"optimizedCheckout-formField-borderColor": "#cccccc",
"optimizedCheckout-formField-textColor": "#333333",
"optimizedCheckout-formField-shadowColor": "#e5e5e5",
"optimizedCheckout-formField-shadowColor": "transparent",
"optimizedCheckout-formField-placeholderColor": "#999999",
"optimizedCheckout-formField-backgroundColor": "#ffffff",
"optimizedCheckout-formField-errorColor": "#d14343",
Expand Down Expand Up @@ -502,9 +502,9 @@
"spinner-borderColor-light": "#fab9a3",
"optimizedCheckout-header-backgroundColor": "#555555",
"optimizedCheckout-headingPrimary-color": "#eeeeee",
"optimizedCheckout-headingPrimary-font": "Google_Roboto_400",
"optimizedCheckout-headingPrimary-font": "Google_Montserrat_700",
"optimizedCheckout-headingSecondary-color": "#ffffff",
"optimizedCheckout-headingSecondary-font": "Google_Roboto_400",
"optimizedCheckout-headingSecondary-font": "Google_Montserrat_700",
"optimizedCheckout-body-backgroundColor": "#444444",
"optimizedCheckout-colorFocus": "#79babd",
"optimizedCheckout-contentPrimary-color": "#ffffff",
Expand Down Expand Up @@ -550,7 +550,7 @@
"optimizedCheckout-form-textColor": "#ffffff",
"optimizedCheckout-formField-borderColor": "#757575",
"optimizedCheckout-formField-textColor": "#ffffff",
"optimizedCheckout-formField-shadowColor": "#404040",
"optimizedCheckout-formField-shadowColor": "transparent",
"optimizedCheckout-formField-placeholderColor": "#999999",
"optimizedCheckout-formField-backgroundColor": "#404040",
"optimizedCheckout-formField-errorColor": "#ffdb6f",
Expand Down Expand Up @@ -711,10 +711,10 @@
"optimizedCheckout-body-backgroundColor": "#ffffff",
"optimizedCheckout-colorFocus": "#6791e6",
"optimizedCheckout-contentPrimary-color": "#74685c",
"optimizedCheckout-contentPrimary-font": "Google_Roboto_400",
"optimizedCheckout-contentPrimary-font": "Google_Montserrat_500",
"optimizedCheckout-contentSecondary-color": "#917052",
"optimizedCheckout-contentSecondary-font": "Google_Roboto_400",
"optimizedCheckout-buttonPrimary-font": "Google_Roboto_400",
"optimizedCheckout-contentSecondary-font": "Google_Montserrat_500",
"optimizedCheckout-buttonPrimary-font": "Google_Montserrat_500",
"optimizedCheckout-buttonPrimary-color": "#ffffff",
"optimizedCheckout-buttonPrimary-colorHover": "#ffffff",
"optimizedCheckout-buttonPrimary-colorActive": "#ffffff",
Expand All @@ -731,7 +731,7 @@
"optimizedCheckout-formChecklist-color": "#4f3f2f",
"optimizedCheckout-formChecklist-borderColor": "#ccbdad",
"optimizedCheckout-formChecklist-backgroundColorSelected": "#f2eee9",
"optimizedCheckout-buttonSecondary-font": "Google_Roboto_400",
"optimizedCheckout-buttonSecondary-font": "Google_Montserrat_500",
"optimizedCheckout-buttonSecondary-color": "#4f3f2f",
"optimizedCheckout-buttonSecondary-colorHover": "#4f3f2f",
"optimizedCheckout-buttonSecondary-colorActive": "#4f3f2f",
Expand All @@ -742,7 +742,7 @@
"optimizedCheckout-buttonSecondary-borderColorHover": "#917052",
"optimizedCheckout-buttonSecondary-borderColorActive": "#917052",
"optimizedCheckout-link-color": "#bd5b00",
"optimizedCheckout-link-font": "Google_Roboto_400",
"optimizedCheckout-link-font": "Google_Montserrat_500",
"optimizedCheckout-discountBanner-backgroundColor": "#f2eee9",
"optimizedCheckout-discountBanner-textColor": "#333333",
"optimizedCheckout-discountBanner-iconColor": "#333333",
Expand All @@ -753,7 +753,7 @@
"optimizedCheckout-form-textColor": "#4f3f2f",
"optimizedCheckout-formField-borderColor": "#ccbdae",
"optimizedCheckout-formField-textColor": "#4f3f2f",
"optimizedCheckout-formField-shadowColor": "#f2eee9",
"optimizedCheckout-formField-shadowColor": "transparent",
"optimizedCheckout-formField-placeholderColor": "#999999",
"optimizedCheckout-formField-backgroundColor": "#ffffff",
"optimizedCheckout-formField-errorColor": "#d14343",
Expand Down
51 changes: 43 additions & 8 deletions schema.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
"options": [
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
Expand Down Expand Up @@ -2125,9 +2125,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat Bold",
"value": "Google_Montserrat_700"
},
{
"group": "Karla",
"label": "Karla",
Expand Down Expand Up @@ -2172,9 +2177,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat Bold",
"value": "Google_Montserrat_700"
},
{
"group": "Karla",
"label": "Karla",
Expand Down Expand Up @@ -2237,9 +2247,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat",
"value": "Google_Montserrat_500"
},
{
"group": "Karla",
"label": "Karla",
Expand Down Expand Up @@ -2284,9 +2299,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat",
"value": "Google_Montserrat_500"
},
{
"group": "Karla",
"label": "Karla",
Expand Down Expand Up @@ -2331,9 +2351,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat",
"value": "Google_Montserrat_500"
},
{
"group": "Karla",
"label": "Karla",
Expand Down Expand Up @@ -2387,9 +2412,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat",
"value": "Google_Montserrat_500"
},
{
"group": "Karla",
"label": "Karla",
Expand Down Expand Up @@ -2493,9 +2523,14 @@
},
{
"group": "Montserrat",
"label": "Montserrat",
"label": "Montserrat Light",
"value": "Google_Montserrat_400"
},
{
"group": "Montserrat",
"label": "Montserrat",
"value": "Google_Montserrat_500"
},
{
"group": "Karla",
"label": "Karla",
Expand Down

0 comments on commit c7b95c5

Please sign in to comment.