From 669c631c6f4500e79b18832e8a98952a7fd1a49e Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 5 Aug 2021 11:28:40 -0400 Subject: [PATCH 1/2] Revert dbe60599b511768d7eb9663c2a5cc01cd694fd51 --- config/settings_data.json | 87 +-------------------------------------- templates/collection.json | 18 +------- 2 files changed, 3 insertions(+), 102 deletions(-) diff --git a/config/settings_data.json b/config/settings_data.json index 167fd52f472..0967ef424bc 100644 --- a/config/settings_data.json +++ b/config/settings_data.json @@ -1,86 +1 @@ -{ - "current": { - "type_header_font": "neue_plak_n3", - "type_body_font": "neue_plak_n3", - "sections": { - "announcement-bar": { - "type": "announcement-bar", - "blocks": { - "announcement-bar-0": { - "type": "announcement", - "settings": { - "text": "Welcome to our store", - "color_scheme": "accent-1", - "link": "" - } - } - }, - "block_order": [ - "announcement-bar-0" - ], - "settings": { - } - }, - "header": { - "type": "header", - "settings": { - "logo_width": 100, - "logo_position": "middle-left", - "menu": "main-menu", - "show_line_separator": true, - "enable_sticky_header": true - } - }, - "footer": { - "type": "footer", - "blocks": { - "footer-0": { - "type": "link_list", - "settings": { - "heading": "Quick links", - "menu": "footer" - } - } - }, - "block_order": [ - "footer-0" - ], - "settings": { - "color_scheme": "background-1", - "newsletter_enable": true, - "newsletter_heading": "Sign up to our emails", - "show_social": false, - "enable_country_selector": true, - "enable_language_selector": true, - "payment_enable": true - } - } - }, - "content_for_index": [ - - ], - "blocks": { - "1627332683be54538b": { - "type": "shopify:\/\/apps\/os2-sample-app\/blocks\/app_embed\/f08f8e21-da04-4bc5-bdfd-918341b448f1", - "disabled": true, - "settings": { - "background_color": "#000000", - "padding_x": 300, - "padding_y": 200, - "show_heading": true, - "heading": "Average Score", - "featured_product": "", - "content": "

Lorem ipsum dolor sit amet consectetur adipisicing elit. Modi expedita veritatis quibusdam quas facilis soluta deserunt aliquid molestias unde culpa. Voluptatibus doloribus doloremque harum ratione?<\/p>" - } - }, - "1627332683ef5cd546": { - "type": "shopify:\/\/apps\/os2-sample-app\/blocks\/confetti_dog\/f08f8e21-da04-4bc5-bdfd-918341b448f1", - "disabled": true, - "settings": { - "button_text": "Start the party!", - "colour": "#000000" - } - } - } - } -} +{} diff --git a/templates/collection.json b/templates/collection.json index ebb6e257e9e..b01c2c8a717 100644 --- a/templates/collection.json +++ b/templates/collection.json @@ -1,24 +1,10 @@ { "sections": { "banner": { - "type": "main-collection-banner", - "settings": { - "show_collection_description": true, - "show_collection_image": true - } + "type": "main-collection-banner" }, "product-grid": { - "type": "main-collection-product-grid", - "settings": { - "products_per_page": 16, - "image_ratio": "adapt", - "show_secondary_image": false, - "add_image_padding": false, - "show_vendor": false, - "enable_filtering": true, - "enable_sorting": true, - "collapse_on_larger_devices": false - } + "type": "main-collection-product-grid" } }, "order": [ From 7939bbfff8f7822003603d821cbe4afab2b78fe7 Mon Sep 17 00:00:00 2001 From: Kai Date: Thu, 5 Aug 2021 12:11:02 -0400 Subject: [PATCH 2/2] Revert escaping of slash --- config/settings_schema.json | 4 +-- locales/en.default.json | 20 ++++++------ locales/en.default.schema.json | 60 +++++++++++++++++----------------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/config/settings_schema.json b/config/settings_schema.json index 4b27ba4adc2..d4b62a81ae1 100644 --- a/config/settings_schema.json +++ b/config/settings_schema.json @@ -4,8 +4,8 @@ "theme_name": "Dawn", "theme_version": "1.1.0", "theme_author": "Shopify", - "theme_documentation_url": "https:\/\/shopify.dev\/themes\/tools\/dawn", - "theme_support_url": "https:\/\/support.shopify.com\/" + "theme_documentation_url": "https://shopify.dev/themes/tools/dawn", + "theme_support_url": "https://support.shopify.com/" }, { "name": "t:settings_schema.colors.name", diff --git a/locales/en.default.json b/locales/en.default.json index 326d75b9111..2550f742e75 100644 --- a/locales/en.default.json +++ b/locales/en.default.json @@ -8,7 +8,7 @@ "login_form_error": "Wrong password!", "login_form_submit": "Enter", "modal": "Password modal", - "admin_link_html": "Are you the store owner? Log in here<\/a>", + "admin_link_html": "Are you the store owner? Log in here", "powered_by_shopify_html": "This shop will be powered by {{ shopify }}" }, "social": { @@ -121,8 +121,8 @@ "view_store_info": "View store information", "check_other_stores": "Check availability at other stores", "pick_up_available": "Pickup available", - "pick_up_available_at_html": "Pickup available at {{ location_name }}<\/span>", - "pick_up_unavailable_at_html": "Pickup currently unavailable at {{ location_name }}<\/span>", + "pick_up_available_at_html": "Pickup available at {{ location_name }}", + "pick_up_unavailable_at_html": "Pickup currently unavailable at {{ location_name }}", "unavailable": "Couldn't load pickup availability", "refresh": "Refresh" }, @@ -193,9 +193,9 @@ "empty": "Your cart is empty", "cart_error": "There was an error while updating your cart. Please try again.", "cart_quantity_error_html": "You can only add [quantity] of this item to your cart.", - "taxes_and_shipping_policy_at_checkout_html": "Taxes and shipping<\/a> calculated at checkout", + "taxes_and_shipping_policy_at_checkout_html": "Taxes and shipping calculated at checkout", "taxes_included_but_shipping_at_checkout": "Tax included and shipping calculated at checkout", - "taxes_included_and_shipping_policy_html": "Tax included. Shipping<\/a> calculated at checkout.", + "taxes_included_and_shipping_policy_html": "Tax included. Shipping calculated at checkout.", "taxes_and_shipping_at_checkout": "Taxes and shipping calculated at checkout", "headings": { "product": "Product", @@ -248,17 +248,17 @@ "sort_by_label": "Sort by:", "title": "Collection", "to": "To", - "use_fewer_filters_html": "Use fewer filters or clear all<\/a>" + "use_fewer_filters_html": "Use fewer filters or clear all" }, "video": { "load_video": "Load video: {{ description }}" } }, "localization": { - "country_label": "Country\/region", + "country_label": "Country/region", "language_label": "Language", "update_language": "Update language", - "update_country": "Update country\/region" + "update_country": "Update country/region" }, "customer": { "account": { @@ -287,9 +287,9 @@ "address1": "Address 1", "address2": "Address 2", "city": "City", - "country": "Country\/region", + "country": "Country/region", "province": "Province", - "zip": "Postal\/ZIP code", + "zip": "Postal/ZIP code", "phone": "Phone", "set_default": "Set as default address", "add": "Add address", diff --git a/locales/en.default.schema.json b/locales/en.default.schema.json index b4b36006eab..96cb120c8ee 100644 --- a/locales/en.default.schema.json +++ b/locales/en.default.schema.json @@ -41,7 +41,7 @@ "settings": { "type_header_font": { "label": "Font", - "info": "Selecting a different font can affect the speed of your store. [Learn more about system fonts.](https:\/\/help.shopify.com\/en\/manual\/online-store\/os\/store-speed\/improving-speed#fonts)" + "info": "Selecting a different font can affect the speed of your store. [Learn more about system fonts.](https://help.shopify.com/en/manual/online-store/os/store-speed/improving-speed#fonts)" }, "header__1": { "content": "Headings" @@ -51,7 +51,7 @@ }, "type_body_font": { "label": "Font", - "info": "Selecting a different font can affect the speed of your store. [Learn more about system fonts.](https:\/\/help.shopify.com\/en\/manual\/online-store\/os\/store-speed\/improving-speed#fonts)" + "info": "Selecting a different font can affect the speed of your store. [Learn more about system fonts.](https://help.shopify.com/en/manual/online-store/os/store-speed/improving-speed#fonts)" } } }, @@ -110,39 +110,39 @@ }, "social_twitter_link": { "label": "Twitter", - "info": "https:\/\/twitter.com\/shopify" + "info": "https://twitter.com/shopify" }, "social_facebook_link": { "label": "Facebook", - "info": "https:\/\/facebook.com\/shopify" + "info": "https://facebook.com/shopify" }, "social_pinterest_link": { "label": "Pinterest", - "info": "https:\/\/pinterest.com\/shopify" + "info": "https://pinterest.com/shopify" }, "social_instagram_link": { "label": "Instagram", - "info": "http:\/\/instagram.com\/shopify" + "info": "http://instagram.com/shopify" }, "social_tiktok_link": { "label": "TikTok", - "info": "https:\/\/tiktok.com\/@shopify" + "info": "https://tiktok.com/@shopify" }, "social_tumblr_link": { "label": "Tumblr", - "info": "https:\/\/shopify.tumblr.com" + "info": "https://shopify.tumblr.com" }, "social_snapchat_link": { "label": "Snapchat", - "info": "https:\/\/www.snapchat.com\/add\/shopify" + "info": "https://www.snapchat.com/add/shopify" }, "social_youtube_link": { "label": "YouTube", - "info": "https:\/\/www.youtube.com\/shopify" + "info": "https://www.youtube.com/shopify" }, "social_vimeo_link": { "label": "Vimeo", - "info": "https:\/\/vimeo.com\/shopify" + "info": "https://vimeo.com/shopify" } } }, @@ -370,7 +370,7 @@ "options__3": { "label": "Square" }, - "info": "To add images, [edit your collections](https:\/\/help.shopify.com\/en\/manual\/products\/collections)" + "info": "To add images, [edit your collections](https://help.shopify.com/en/manual/products/collections)" }, "color_scheme": { "options__1": { @@ -569,7 +569,7 @@ }, "header__1": { "content": "Email Signup", - "info": "Subscribers added to your “accepted marketing” [customer list.](https:\/\/help.shopify.com\/en\/manual\/customers\/manage-customers)" + "info": "Subscribers added to your “accepted marketing” [customer list.](https://help.shopify.com/en/manual/customers/manage-customers)" }, "header__2": { "content": "Social media icons", @@ -579,19 +579,19 @@ "label": "Show social media icons" }, "header__3": { - "content": "Country\/region selector" + "content": "Country/region selector" }, "header__4": { - "info": "To add a country\/region, go to your [payment settings.](\/admin\/settings\/payments)" + "info": "To add a country/region, go to your [payment settings.](/admin/settings/payments)" }, "enable_country_selector": { - "label": "Enable country\/region selector" + "label": "Enable country/region selector" }, "header__5": { "content": "Language selector" }, "header__6": { - "info": "To add a language, go to your [language settings.](\/admin\/settings\/languages)" + "info": "To add a language, go to your [language settings.](/admin/settings/languages)" }, "enable_language_selector": { "label": "Enable language selector" @@ -851,10 +851,10 @@ "name": "Share", "settings": { "featured_image_info": { - "content": "If you include a link in social media posts, the page’s featured image will be shown as the preview image. [Learn more](https:\/\/help.shopify.com\/en\/manual\/online-store\/images\/showing-social-media-thumbnail-images)." + "content": "If you include a link in social media posts, the page’s featured image will be shown as the preview image. [Learn more](https://help.shopify.com/en/manual/online-store/images/showing-social-media-thumbnail-images)." }, "title_info": { - "content": "A store title and description are included with the preview image. [Learn more](https:\/\/help.shopify.com\/en\/manual\/promoting-marketing\/seo\/adding-keywords#set-a-title-and-description-for-your-online-store)." + "content": "A store title and description are included with the preview image. [Learn more](https://help.shopify.com/en/manual/promoting-marketing/seo/adding-keywords#set-a-title-and-description-for-your-online-store)." } } } @@ -877,7 +877,7 @@ "label": "Show author" }, "paragraph": { - "content": "To change excerpts, edit your [blog posts.](https:\/\/help.shopify.com\/en\/manual\/online-store\/blogs\/writing-blogs#display-an-excerpt-from-a-blog-post)" + "content": "To change excerpts, edit your [blog posts.](https://help.shopify.com/en/manual/online-store/blogs/writing-blogs#display-an-excerpt-from-a-blog-post)" } } }, @@ -909,7 +909,7 @@ "name": "Collection banner", "settings": { "paragraph": { - "content": "To change collection descriptions or collection images, [edit your collections.](\/admin\/collections)" + "content": "To change collection descriptions or collection images, [edit your collections.](/admin/collections)" }, "show_collection_description": { "label": "Show collection description" @@ -928,7 +928,7 @@ }, "enable_filtering": { "label": "Enable filtering", - "info": "[Customize filters](\/admin\/menus)" + "info": "[Customize filters](/admin/menus)" }, "enable_sorting": { "label": "Enable sorting" @@ -965,7 +965,7 @@ }, "enable_tags": { "label": "Enable filtering", - "info": "[Customize filters](\/admin\/menus)" + "info": "[Customize filters](/admin/menus)" }, "enable_sort": { "label": "Enable sorting" @@ -1013,7 +1013,7 @@ "options__3": { "label": "Square" }, - "info": "To add images, [edit your collections](https:\/\/help.shopify.com\/en\/manual\/products\/collections)" + "info": "To add images, [edit your collections](https://help.shopify.com/en/manual/products/collections)" }, "color_scheme": { "options__1": { @@ -1145,7 +1145,7 @@ "settings": { "show_dynamic_checkout": { "label": "Show dynamic checkout buttons", - "info": "Using the payment methods available on your store, customers see their preferred option, like PayPal or Apple Pay. [Learn more](https:\/\/help.shopify.com\/manual\/using-themes\/change-the-layout\/dynamic-checkout)" + "info": "Using the payment methods available on your store, customers see their preferred option, like PayPal or Apple Pay. [Learn more](https://help.shopify.com/manual/using-themes/change-the-layout/dynamic-checkout)" } } }, @@ -1159,10 +1159,10 @@ "name": "Share", "settings": { "featured_image_info": { - "content": "If you include a link in social media posts, the page’s featured image will be shown as the preview image. [Learn more](https:\/\/help.shopify.com\/en\/manual\/online-store\/images\/showing-social-media-thumbnail-images)." + "content": "If you include a link in social media posts, the page’s featured image will be shown as the preview image. [Learn more](https://help.shopify.com/en/manual/online-store/images/showing-social-media-thumbnail-images)." }, "title_info": { - "content": "A store title and description are included with the preview image. [Learn more](https:\/\/help.shopify.com\/en\/manual\/promoting-marketing\/seo\/adding-keywords#set-a-title-and-description-for-your-online-store)." + "content": "A store title and description are included with the preview image. [Learn more](https://help.shopify.com/en/manual/promoting-marketing/seo/adding-keywords#set-a-title-and-description-for-your-online-store)." } } }, @@ -1279,7 +1279,7 @@ "settings": { "header": { "content": "Media", - "info": "Learn more about [media types](https:\/\/help.shopify.com\/manual\/products\/product-media)" + "info": "Learn more about [media types](https://help.shopify.com/manual/products/product-media)" }, "enable_sticky_info": { "label": "Enable sticky product information on large screens" @@ -1439,7 +1439,7 @@ "label": "Make section full width" }, "paragraph": { - "content": "When customers subscribe to emails, customer accounts are created. [Learn more](https:\/\/help.shopify.com\/en\/manual\/customers)" + "content": "When customers subscribe to emails, customer accounts are created. [Learn more](https://help.shopify.com/en/manual/customers)" } }, "blocks": { @@ -1485,7 +1485,7 @@ "label": "Heading" }, "paragraph__1": { - "content": "Dynamic recommendations use order and product information to change and improve over time. [Learn more](https:\/\/help.shopify.com\/en\/themes\/development\/recommended-products)" + "content": "Dynamic recommendations use order and product information to change and improve over time. [Learn more](https://help.shopify.com/en/themes/development/recommended-products)" }, "header__2": { "content": "Product card"