Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standardize heading font size options, add larger size #3498

Merged
merged 20 commits into from
Jun 7, 2024
Merged

Standardize heading font size options, add larger size #3498

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
a5c5f84
Add gigantic heading size.
kjellr Jun 3, 2024
5d1ecc0
Use global translations in multirow.
kjellr Jun 3, 2024
a0f7efc
Standardize heading font size offerings.
kjellr Jun 3, 2024
cd7ba9b
Change "Gigantic" to "Giant"
kjellr Jun 3, 2024
48e1ceb
Set line height for new font size.
kjellr Jun 4, 2024
316893b
Update 10 translation files
translation-platform[bot] Jun 4, 2024
4281d4e
Decrease Giant font size, update line height too.
kjellr Jun 4, 2024
f0069a8
Define line height for hxl.
kjellr Jun 4, 2024
79bc894
Merge branch 'main' into add/larger-heading-size
kjellr Jun 4, 2024
8ff06f9
Fix incorrect reference.
kjellr Jun 5, 2024
4b64e5a
Set large line height to 1.1 all the time.
kjellr Jun 5, 2024
f6a67c0
Adjust `vw` value in clamp so that the Giant font size is always larg…
kjellr Jun 5, 2024
f3322db
Merge branch 'main' into add/larger-heading-size
kjellr Jun 5, 2024
ea41f88
Change string to "Extra Extra Large"
kjellr Jun 5, 2024
37095a7
Merge branch 'add/larger-heading-size' of https://github.com/Shopify/…
kjellr Jun 5, 2024
b04e9dc
Change text case.
kjellr Jun 5, 2024
c19c9d9
Update 13 translation files
translation-platform[bot] Jun 6, 2024
e1fd54a
Update 4 translation files
translation-platform[bot] Jun 6, 2024
c9a2578
Update 2 translation files
translation-platform[bot] Jun 7, 2024
993e045
Update 1 translation file
translation-platform[bot] Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions assets/base.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,11 @@ h5,
word-break: break-word;
}

.hxxl {
font-size: clamp(calc(var(--font-heading-scale) * 6.2rem), 10vw, calc(var(--font-heading-scale) * 80rem));
line-height: calc(1 / max(1, var(--font-heading-scale)));
kjellr marked this conversation as resolved.
Show resolved Hide resolved
}

.hxl {
font-size: calc(var(--font-heading-scale) * 5rem);
}
Expand Down
15 changes: 3 additions & 12 deletions locales/en.default.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,9 @@
},
"options__4": {
"label": "Extra large"
},
"options__5": {
"label": "Giant"
kjellr marked this conversation as resolved.
Show resolved Hide resolved
}
},
"image_shape": {
Expand Down Expand Up @@ -1536,18 +1539,6 @@
"label": "Desktop image width",
"info": "Image is automatically optimized for mobile."
},
"heading_size": {
"options__1": {
"label": "Small"
},
"options__2": {
"label": "Medium"
},
"options__3": {
"label": "Large"
},
"label": "Heading size"
},
"text_style": {
"options__1": {
"label": "Body"
Expand Down
8 changes: 8 additions & 0 deletions sections/collage.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
</div>
</div>

{% schema %}

Check notice on line 211 in sections/collage.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/collage.liquid#L211 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.collage.name",
"tag": "section",
Expand Down Expand Up @@ -238,6 +238,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/collapsible-content.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
</div>
</div>

{% schema %}

Check notice on line 109 in sections/collapsible-content.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/collapsible-content.liquid#L109 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.collapsible_content.name",
"tag": "section",
Expand Down Expand Up @@ -141,6 +141,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/collection-list.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
</div>
</div>

{% schema %}

Check notice on line 132 in sections/collection-list.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/collection-list.liquid#L132 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.collection-list.name",
"tag": "section",
Expand Down Expand Up @@ -160,6 +160,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/contact-form.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
</div>
</div>

{% schema %}

Check notice on line 136 in sections/contact-form.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/contact-form.liquid#L136 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.contact-form.name",
"tag": "section",
Expand Down Expand Up @@ -163,6 +163,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/email-signup-banner.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
</div>
</div>

{% schema %}

Check notice on line 139 in sections/email-signup-banner.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/email-signup-banner.liquid#L139 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.email-signup-banner.name",
"tag": "section",
Expand Down Expand Up @@ -327,6 +327,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/featured-blog.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
</div>
</div>

{% schema %}

Check notice on line 189 in sections/featured-blog.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/featured-blog.liquid#L189 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.featured-blog.name",
"tag": "section",
Expand Down Expand Up @@ -215,6 +215,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/featured-collection.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@
</div>
</div>

{% schema %}

Check notice on line 193 in sections/featured-collection.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/featured-collection.liquid#L193 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.featured-collection.name",
"tag": "section",
Expand Down Expand Up @@ -220,6 +220,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/featured-product.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,11 +365,11 @@
render 'share-button', block: block, share_link: share_url
%}
{%- when 'variant_picker' -%}
{% render 'product-variant-picker',
product: product,
block: block,
product_form_id: product_form_id
%}

Check warning on line 372 in sections/featured-product.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/featured-product.liquid#L368-L372 

[NestedSnippet] Too many nested snippets

Check warning on line 372 in sections/featured-product.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/featured-product.liquid#L368-L372 

[NestedSnippet] Too many nested snippets

Check warning on line 372 in sections/featured-product.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/featured-product.liquid#L368-L372 

[NestedSnippet] Too many nested snippets
{%- when 'buy_buttons' -%}
{%- render 'buy-buttons',
block: block,
Expand Down Expand Up @@ -513,7 +513,7 @@
{% endif %}
</product-info>

{% schema %}

Check notice on line 516 in sections/featured-product.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/featured-product.liquid#L516 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.featured-product.name",
"tag": "section",
Expand Down Expand Up @@ -577,6 +577,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/image-banner.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
</div>
</div>

{% schema %}

Check notice on line 169 in sections/image-banner.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/image-banner.liquid#L169 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.image-banner.name",
"tag": "section",
Expand Down Expand Up @@ -388,6 +388,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/image-with-text.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</div>
</div>

{% schema %}

Check notice on line 110 in sections/image-with-text.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/image-with-text.liquid#L110 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.image-with-text.name",
"class": "section",
Expand Down Expand Up @@ -350,6 +350,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/multicolumn.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@
</div>
</div>

{% schema %}

Check notice on line 191 in sections/multicolumn.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/multicolumn.liquid#L191 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.multicolumn.name",
"class": "section",
Expand Down Expand Up @@ -218,6 +218,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
14 changes: 11 additions & 3 deletions sections/multirow.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
</div>
</div>

{% schema %}

Check notice on line 110 in sections/multirow.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/multirow.liquid#L110 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.multirow.name",
"class": "section",
Expand Down Expand Up @@ -166,15 +166,23 @@
"options": [
{
"value": "h2",
"label": "t:sections.multirow.settings.heading_size.options__1.label"
"label": "t:sections.all.heading_size.options__1.label"
kjellr marked this conversation as resolved.
Show resolved Hide resolved
},
{
"value": "h1",
"label": "t:sections.multirow.settings.heading_size.options__2.label"
"label": "t:sections.all.heading_size.options__2.label"
},
{
"value": "h0",
"label": "t:sections.multirow.settings.heading_size.options__3.label"
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
kjellr marked this conversation as resolved.
Show resolved Hide resolved
Expand Down
8 changes: 8 additions & 0 deletions sections/newsletter.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
</div>
</div>

{% schema %}

Check notice on line 117 in sections/newsletter.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/newsletter.liquid#L117 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.newsletter.name",
"tag": "section",
Expand Down Expand Up @@ -191,6 +191,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/page.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</div>
</div>

{% schema %}

Check notice on line 38 in sections/page.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/page.liquid#L38 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.page.name",
"tag": "section",
Expand Down Expand Up @@ -64,6 +64,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/related-products.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
4 changes: 4 additions & 0 deletions sections/rich-text.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</div>
</div>

{% schema %}

Check notice on line 97 in sections/rich-text.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/rich-text.liquid#L97 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.rich-text.name",
"tag": "section",
Expand Down Expand Up @@ -212,6 +212,10 @@
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/slideshow.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@
<script src="{{ 'theme-editor.js' | asset_url }}" defer="defer"></script>
{%- endif -%}

{% schema %}

Check notice on line 248 in sections/slideshow.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/slideshow.liquid#L248 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.slideshow.name",
"tag": "section",
Expand Down Expand Up @@ -404,6 +404,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
8 changes: 8 additions & 0 deletions sections/video.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
</div>
</div>

{% schema %}

Check notice on line 121 in sections/video.liquid

View workflow job for this annotation

GitHub Actions / Theme Check Report

sections/video.liquid#L121 

[SchemaJsonFormat] JSON formatting could be improved
{
"name": "t:sections.video.name",
"tag": "section",
Expand Down Expand Up @@ -148,6 +148,14 @@
{
"value": "h0",
"label": "t:sections.all.heading_size.options__3.label"
},
{
"value": "hxl",
"label": "t:sections.all.heading_size.options__4.label"
},
{
"value": "hxxl",
"label": "t:sections.all.heading_size.options__5.label"
}
],
"default": "h1",
Expand Down
Loading