Skip to content

Commit

Permalink
Merge pull request #131 from atriantas/staging-04-2024
Browse files Browse the repository at this point in the history
Staging 04 2024
  • Loading branch information
atriantas authored May 24, 2024
2 parents 0d0ebdf + 6b5c121 commit d414952
Show file tree
Hide file tree
Showing 4 changed files with 92 additions and 79 deletions.
5 changes: 3 additions & 2 deletions assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ h1,
@media only screen and (min-width: 750px) {
h1,
.h1 {
font-size: calc(var(--font-heading-scale) * 2.6rem);
font-size: calc(var(--font-heading-scale) * 2.4rem);
}
}

Expand Down Expand Up @@ -1367,8 +1367,9 @@ button.shopify-payment-button__button--unbranded {
/* Button - social share */

.share-button {
display: block;
display: flex;
position: relative;
justify-content: center;
}

.share-button details {
Expand Down
1 change: 1 addition & 0 deletions assets/estimated-time.css
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
.v-route-cont {
border-radius: var(--inputs-radius);
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset) var(--inputs-shadow-blur-radius) rgba(var(--color-shadow), var(--inputs-shadow-opacity));
border: 1px solid #a3a29b;
}

.estimated-title {
Expand Down
95 changes: 58 additions & 37 deletions templates/product.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"8b876c32-b5c2-401f-9f7b-24ea70f8194d": {
"type": "breadcrumb-bar",
"settings": {
"breadcrumb_text": ""
}
},
"main": {
Expand Down Expand Up @@ -49,14 +50,20 @@
"show_gift_card_recipient": true
}
},
"estimated_cQrfGM": {
"share": {
"type": "share",
"settings": {
"share_label": "Get a second opinion from your friends!"
}
},
"estimated_3faKje": {
"type": "estimated",
"settings": {
"estimate": "Estimated delivery date",
"order_placed": "Order placed",
"order_shipped": "Parcel shipped",
"order_deliveried": "Delivered",
"delivery_color": "#f6f6f4"
"delivery_color": "#ffffff"
}
},
"16bf1687-5947-4c0a-aec9-fa723370ab9b": {
Expand All @@ -80,12 +87,6 @@
"settings": {
}
},
"share": {
"type": "share",
"settings": {
"share_label": "Get a second opinion from your friends!"
}
},
"collapsible-row-2": {
"type": "collapsible_tab",
"settings": {
Expand Down Expand Up @@ -140,6 +141,23 @@
"settings": {
"custom_liquid": "<div style=\"text-align:center; font-weight: bold; font-size: 13px; border-radius:8px; padding:8px; background-color: #F8F1DC; box-shadow:var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset) var(--inputs-shadow-blur-radius) rgba(var(--color-shadow),var(--inputs-shadow-opacity));\">Visit our <a href=\"https:\/\/www.etsy.com\/shop\/CyanoWood\" target=\"_blank\" style=\"color: #219394;\">Etsy<\/a> and <a href=\"https:\/\/www.amazon.de\/s?me=A123C76R657ZYQ\" target=\"_blank\" style=\"color: #219394;\">Amazon<\/a> store<\/div>"
}
},
"planet_shopify_planet_G38rf9": {
"type": "shopify:\/\/apps\/planet\/blocks\/shopify-planet\/12047591-3a2d-45cc-9dfd-2ce5eaa45dee",
"settings": {
"badgeMode": "info",
"showLogo": false,
"showMoreInfo": false,
"showStats": true,
"showProjects": false,
"backgroundColor": "#F1F8F5",
"textColor": "#1D4136",
"borderColor": "#dcebe5",
"fullWidth": true,
"marginTop": 0,
"marginBottom": 0,
"borderRadius": 8
}
}
},
"block_order": [
Expand All @@ -150,16 +168,18 @@
"variant_picker",
"quantity_selector",
"buy_buttons",
"estimated_cQrfGM",
"share",
"estimated_3faKje",
"custom_liquid_WRmGPj",
"16bf1687-5947-4c0a-aec9-fa723370ab9b",
"description",
"share",
"collapsible-row-2",
"collapsible-row-1",
"cae09299-0138-4778-9cae-687065ec0055",
"collapsible-row-3",
"ee9cabe6-5fd7-437c-bda3-fc3da5f6c42d",
"062780e5-2649-4f34-8f19-c728b7e27bd5"
"062780e5-2649-4f34-8f19-c728b7e27bd5",
"planet_shopify_planet_G38rf9"
],
"custom_css": [
".icon-with-text--horizontal .h4 {font-weight: bold; font-size: 1.2rem;}"
Expand All @@ -180,6 +200,27 @@
"padding_bottom": 52
}
},
"related-products": {
"type": "related-products",
"custom_css": [
"h2 {font-weight: bold; text-align: center;}"
],
"settings": {
"heading": "You may also like",
"heading_size": "h2",
"products_to_show": 4,
"columns_desktop": 4,
"color_scheme": "scheme-1",
"image_ratio": "square",
"image_shape": "round",
"show_secondary_image": false,
"show_vendor": false,
"show_rating": true,
"columns_mobile": "2",
"padding_top": 12,
"padding_bottom": 12
}
},
"1707256775b2e0fe15": {
"type": "apps",
"blocks": {
Expand All @@ -194,41 +235,21 @@
"backgroundColor": "#e8f5ea",
"textColor": "#103c15",
"borderColor": "#cfe3d0",
"fullWidth": true,
"marginTop": 0,
"marginBottom": 7,
"borderRadius": 12
"fullWidth": false,
"marginTop": 4,
"marginBottom": 0,
"borderRadius": 8
}
}
},
"block_order": [
"planet_shopify_planet_8WnpYU"
],
"disabled": true,
"settings": {
"include_margins": true
}
},
"related-products": {
"type": "related-products",
"custom_css": [
"h2 {font-weight: bold; text-align: center;}"
],
"settings": {
"heading": "You may also like",
"heading_size": "h2",
"products_to_show": 4,
"columns_desktop": 4,
"color_scheme": "scheme-1",
"image_ratio": "square",
"image_shape": "round",
"show_secondary_image": false,
"show_vendor": false,
"show_rating": true,
"columns_mobile": "2",
"padding_top": 12,
"padding_bottom": 12
}
},
"1b4fda5a-f866-4d3a-8aea-81ba94858dba": {
"type": "custom-liquid",
"settings": {
Expand Down Expand Up @@ -268,8 +289,8 @@
"order": [
"8b876c32-b5c2-401f-9f7b-24ea70f8194d",
"main",
"1707256775b2e0fe15",
"related-products",
"1707256775b2e0fe15",
"1b4fda5a-f866-4d3a-8aea-81ba94858dba",
"1707229620adf6be7a"
]
Expand Down
70 changes: 30 additions & 40 deletions templates/product.personalised-product.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"880150c9-0457-4f23-b7fe-34088e05bc34": {
"type": "breadcrumb-bar",
"settings": {
"breadcrumb_text": ""
}
},
"main": {
Expand Down Expand Up @@ -64,14 +65,20 @@
"show_gift_card_recipient": true
}
},
"estimated_pCjQ6a": {
"share": {
"type": "share",
"settings": {
"share_label": "Get a second opinion from your friends!"
}
},
"estimated_YGqb6V": {
"type": "estimated",
"settings": {
"estimate": "Estimated delivery date",
"order_placed": "Order placed",
"order_shipped": "Parcel shipped",
"order_deliveried": "Delivered",
"delivery_color": "#f6f6f4"
"delivery_color": "#ffffff"
}
},
"16bf1687-5947-4c0a-aec9-fa723370ab9b": {
Expand All @@ -95,12 +102,6 @@
"settings": {
}
},
"share": {
"type": "share",
"settings": {
"share_label": "Get a second opinion from your friends!"
}
},
"collapsible-row-2": {
"type": "collapsible_tab",
"settings": {
Expand Down Expand Up @@ -155,6 +156,23 @@
"settings": {
"custom_liquid": "<div style=\"text-align:center; font-weight: bold; font-size: 13px; border-radius:8px; padding:8px; background-color: #F8F1DC; box-shadow:var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset) var(--inputs-shadow-blur-radius) rgba(var(--color-shadow),var(--inputs-shadow-opacity));\">Visit our <a href=\"https:\/\/www.etsy.com\/shop\/CyanoWood\" target=\"_blank\" style=\"color: #219394;\">Etsy<\/a> and <a href=\"https:\/\/www.amazon.de\/s?me=A123C76R657ZYQ\" target=\"_blank\" style=\"color: #219394;\">Amazon<\/a> store<\/div>"
}
},
"planet_shopify_planet_89LUmm": {
"type": "shopify:\/\/apps\/planet\/blocks\/shopify-planet\/12047591-3a2d-45cc-9dfd-2ce5eaa45dee",
"settings": {
"badgeMode": "info",
"showLogo": false,
"showMoreInfo": true,
"showStats": true,
"showProjects": false,
"backgroundColor": "#F1F8F5",
"textColor": "#1D4136",
"borderColor": "#dcebe5",
"fullWidth": true,
"marginTop": 0,
"marginBottom": 0,
"borderRadius": 8
}
}
},
"block_order": [
Expand All @@ -167,16 +185,17 @@
"personalise",
"d3ae2714-28b2-4757-a5a4-1f9171cc6648",
"buy_buttons",
"estimated_pCjQ6a",
"share",
"estimated_YGqb6V",
"16bf1687-5947-4c0a-aec9-fa723370ab9b",
"description",
"share",
"collapsible-row-2",
"collapsible-row-1",
"92b2f665-58ab-4f83-a4be-e9e7a399e5e9",
"collapsible-row-3",
"4aea6cec-59cc-49cb-b2bc-45d1ce054b0b",
"29c6eafb-fc66-4e9e-9eaf-eafbf79f419a"
"29c6eafb-fc66-4e9e-9eaf-eafbf79f419a",
"planet_shopify_planet_89LUmm"
],
"custom_css": [
".icon-with-text--horizontal .h4 {font-weight: bold; font-size: 1.2rem;}"
Expand All @@ -197,34 +216,6 @@
"padding_bottom": 52
}
},
"1707258800bbbafd45": {
"type": "apps",
"blocks": {
"planet_shopify_planet_UHEEHt": {
"type": "shopify:\/\/apps\/planet\/blocks\/shopify-planet\/12047591-3a2d-45cc-9dfd-2ce5eaa45dee",
"settings": {
"badgeMode": "info",
"showLogo": false,
"showMoreInfo": false,
"showStats": true,
"showProjects": false,
"backgroundColor": "#e8f5ea",
"textColor": "#103c15",
"borderColor": "#cfe3d0",
"fullWidth": true,
"marginTop": 0,
"marginBottom": 7,
"borderRadius": 8
}
}
},
"block_order": [
"planet_shopify_planet_UHEEHt"
],
"settings": {
"include_margins": true
}
},
"related-products": {
"type": "related-products",
"custom_css": [
Expand Down Expand Up @@ -285,7 +276,6 @@
"order": [
"880150c9-0457-4f23-b7fe-34088e05bc34",
"main",
"1707258800bbbafd45",
"related-products",
"573adcd4-4629-440d-ae6a-7a09bb7d6e98",
"1707227944349cd686"
Expand Down

0 comments on commit d414952

Please sign in to comment.