Skip to content

Commit

Permalink
updated code to match new color scheme naming (#2801)
Browse files Browse the repository at this point in the history
* updated code to match new color scheme naming

* removing additional background-1 after rebase
  • Loading branch information
lougoncharenko authored Nov 9, 2023
1 parent ab71c57 commit b0ba46d
Show file tree
Hide file tree
Showing 44 changed files with 73 additions and 73 deletions.
2 changes: 1 addition & 1 deletion assets/collapsible-content.css
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
border-top: 0;
}

.collapsible-row-layout .accordion:not(:first-child):not(.color-background-1) {
.collapsible-row-layout .accordion:not(:first-child):not(.color-scheme-1) {
margin-top: 1rem;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/component-card.css
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
}

/* Needed for gradient continuity with or without animation so that transparent PNG images come up as we would expect */
.card__inner.color-background-1 {
.card__inner.color-scheme-1 {
background: transparent;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/section-footer.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
border-top: 0.1rem solid rgba(var(--color-foreground), 0.08);
}

.footer:not(.color-background-1) {
.footer:not(.color-scheme-1) {
border-top: none;
}

Expand Down
2 changes: 1 addition & 1 deletion assets/section-image-banner.css
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@
}

.banner:not(.banner--mobile-bottom) .field__input,
.banner--mobile-bottom:not(.banner--stacked) .banner__box.color-background-1 {
.banner--mobile-bottom:not(.banner--stacked) .banner__box.color-scheme-1 {
background: transparent;
}
}
Expand Down
24 changes: 12 additions & 12 deletions config/settings_data.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"Default": {
"logo_width": 90,
"color_schemes": {
"background-1": {
"scheme-1": {
"settings": {
"background": "#FFFFFF",
"background_gradient": "",
Expand All @@ -15,7 +15,7 @@
"shadow": "#121212"
}
},
"background-2": {
"scheme-2": {
"settings": {
"background": "#F3F3F3",
"background_gradient": "",
Expand All @@ -26,7 +26,7 @@
"shadow": "#121212"
}
},
"inverse": {
"scheme-3": {
"settings": {
"background": "#242833",
"background_gradient": "",
Expand All @@ -37,7 +37,7 @@
"shadow": "#121212"
}
},
"accent-1": {
"scheme-4": {
"settings": {
"background": "#121212",
"background_gradient": "",
Expand All @@ -48,7 +48,7 @@
"shadow": "#121212"
}
},
"accent-2": {
"scheme-5": {
"settings": {
"background": "#334FB4",
"background_gradient": "",
Expand Down Expand Up @@ -92,7 +92,7 @@
"card_style": "standard",
"card_image_padding": 0,
"card_text_alignment": "left",
"card_color_scheme": "background-2",
"card_color_scheme": "scheme-2",
"card_border_thickness": 0,
"card_border_opacity": 10,
"card_corner_radius": 0,
Expand All @@ -103,7 +103,7 @@
"collection_card_style": "standard",
"collection_card_image_padding": 0,
"collection_card_text_alignment": "left",
"collection_card_color_scheme": "background-2",
"collection_card_color_scheme": "scheme-2",
"collection_card_border_thickness": 0,
"collection_card_border_opacity": 10,
"collection_card_corner_radius": 0,
Expand All @@ -114,7 +114,7 @@
"blog_card_style": "standard",
"blog_card_image_padding": 0,
"blog_card_text_alignment": "left",
"blog_card_color_scheme": "background-2",
"blog_card_color_scheme": "scheme-2",
"blog_card_border_thickness": 0,
"blog_card_border_opacity": 10,
"blog_card_corner_radius": 0,
Expand Down Expand Up @@ -151,8 +151,8 @@
"drawer_shadow_blur": 5,
"badge_position": "bottom left",
"badge_corner_radius": 40,
"sale_badge_color_scheme": "accent-2",
"sold_out_badge_color_scheme": "inverse",
"sale_badge_color_scheme": "scheme-5",
"sold_out_badge_color_scheme": "scheme-3",
"social_twitter_link": "",
"social_facebook_link": "",
"social_pinterest_link": "",
Expand All @@ -174,13 +174,13 @@
"main-password-header": {
"type": "main-password-header",
"settings": {
"color_scheme": "background-1"
"color_scheme": "scheme-1"
}
},
"main-password-footer": {
"type": "main-password-footer",
"settings": {
"color_scheme": "background-1"
"color_scheme": "scheme-1"
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions config/settings_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
"type": "color_scheme",
"id": "card_color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-2"
"default": "scheme-2"
},
{
"type": "header",
Expand Down Expand Up @@ -674,7 +674,7 @@
"type": "color_scheme",
"id": "collection_card_color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-2"
"default": "scheme-2"
},
{
"type": "header",
Expand Down Expand Up @@ -809,7 +809,7 @@
"type": "color_scheme",
"id": "blog_card_color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-2"
"default": "scheme-2"
},
{
"type": "header",
Expand Down Expand Up @@ -1258,13 +1258,13 @@
"type": "color_scheme",
"id": "sale_badge_color_scheme",
"label": "t:settings_schema.badges.settings.sale_badge_color_scheme.label",
"default": "accent-2"
"default": "scheme-5"
},
{
"type": "color_scheme",
"id": "sold_out_badge_color_scheme",
"label": "t:settings_schema.badges.settings.sold_out_badge_color_scheme.label",
"default": "inverse"
"default": "scheme-3"
}
]
},
Expand Down Expand Up @@ -1462,7 +1462,7 @@
"type": "color_scheme",
"id": "cart_color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion sections/announcement-bar.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "accent-1"
"default": "scheme-4"
},
{
"type": "checkbox",
Expand Down
2 changes: 1 addition & 1 deletion sections/collage.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"info": "t:sections.all.colors.has_cards_info",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
4 changes: 2 additions & 2 deletions sections/collapsible-content.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -190,14 +190,14 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "color_scheme",
"id": "container_color_scheme",
"label": "t:sections.collapsible_content.settings.container_color_scheme.label",
"info": "t:sections.collapsible_content.settings.container_color_scheme.info",
"default": "background-2"
"default": "scheme-2"
},
{
"type": "checkbox",
Expand Down
2 changes: 1 addition & 1 deletion sections/collection-list.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"info": "t:sections.all.colors.has_cards_info",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "checkbox",
Expand Down
2 changes: 1 addition & 1 deletion sections/contact-form.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/custom-liquid.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/email-signup-banner.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"info": "t:sections.email-signup-banner.settings.color_scheme.info",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/featured-blog.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"info": "t:sections.all.colors.has_cards_info",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "checkbox",
Expand Down
2 changes: 1 addition & 1 deletion sections/featured-collection.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"info": "t:sections.all.colors.has_cards_info",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/featured-product.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -1513,7 +1513,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "checkbox",
Expand Down
2 changes: 1 addition & 1 deletion sections/footer-group.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"footer-2"
],
"settings": {
"color_scheme": "background-1",
"color_scheme": "scheme-1",
"newsletter_enable": true,
"newsletter_heading": "Subscribe to our emails",
"show_social": true,
Expand Down
2 changes: 1 addition & 1 deletion sections/footer.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
4 changes: 2 additions & 2 deletions sections/header-group.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"settings": {
"text": "Welcome to our store",
"text_alignment": "center",
"color_scheme": "background-1",
"color_scheme": "scheme-1",
"link": ""
}
}
Expand All @@ -22,7 +22,7 @@
"header": {
"type": "header",
"settings": {
"color_scheme": "background-1",
"color_scheme": "scheme-1",
"logo_position": "middle-left",
"menu": "main-menu",
"menu_type_desktop": "dropdown",
Expand Down
4 changes: 2 additions & 2 deletions sections/header.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -591,13 +591,13 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "color_scheme",
"id": "menu_color_scheme",
"label": "t:sections.header.settings.menu_color_scheme.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/image-banner.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
4 changes: 2 additions & 2 deletions sections/image-with-text.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,13 @@
"type": "color_scheme",
"id": "section_color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.multirow.settings.container_color_scheme.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/main-cart-footer.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "range",
Expand Down
2 changes: 1 addition & 1 deletion sections/main-cart-items.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
2 changes: 1 addition & 1 deletion sections/main-collection-banner.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"type": "color_scheme",
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"default": "background-1"
"default": "scheme-1"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion sections/main-collection-product-grid.liquid
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@
"id": "color_scheme",
"label": "t:sections.all.colors.label",
"info": "t:sections.all.colors.has_cards_info",
"default": "background-1"
"default": "scheme-1"
},
{
"type": "header",
Expand Down
Loading

0 comments on commit b0ba46d

Please sign in to comment.