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

Remove menu title requirement #1763

Merged
merged 12 commits into from
Jun 13, 2022
Merged

Remove menu title requirement #1763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9a350bb
Menu heading
Jun 1, 2022
3eb981e
Update footer.liquid
Jun 1, 2022
8b13eaf
Remove helper text
Jun 1, 2022
f1d227b
Remove translations
Jun 1, 2022
08ec3aa
Update footer
Jun 1, 2022
c62fabd
Update footer
Jun 1, 2022
8d8f35b
Update footer
Jun 1, 2022
cbc96d2
Update footer
Jun 1, 2022
7690693
Revert changes
Jun 1, 2022
a5e06aa
Fixes
Jun 1, 2022
76c70b1
Update
Jun 2, 2022
47c8127
Update to footer
Jun 2, 2022
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
3 changes: 1 addition & 2 deletions locales/cs.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Nabídka",
"settings": {
"heading": {
"label": "Nadpis",
"info": "Pokud chcete zobrazit nabídku, je nutný nadpis."
"label": "Nadpis"
},
"menu": {
"label": "Nabídka",
Expand Down
3 changes: 1 addition & 2 deletions locales/da.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Overskrift",
"info": "Der skal angives en overskrift, for at menuen kan vises."
"label": "Overskrift"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/de.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menü",
"settings": {
"heading": {
"label": "Überschrift",
"info": "Überschrift ist erforderlich, um das Menü anzuzeigen."
"label": "Überschrift"
},
"menu": {
"label": "Menü",
Expand Down
3 changes: 1 addition & 2 deletions locales/en.default.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,8 +814,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Heading",
"info": "Heading required to display the menu."
"label": "Heading"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/es.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menú",
"settings": {
"heading": {
"label": "Encabezado",
"info": "Se requiere un título para mostrar el menú."
"label": "Encabezado"
},
"menu": {
"label": "Menú",
Expand Down
3 changes: 1 addition & 2 deletions locales/fi.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Valikko",
"settings": {
"heading": {
"label": "Otsikko",
"info": "Valikon näyttäminen edellyttää otsikkoa."
"label": "Otsikko"
},
"menu": {
"label": "Valikko",
Expand Down
3 changes: 1 addition & 2 deletions locales/fr.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "En-tête",
"info": "Un titre est nécessaire pour afficher le menu."
"label": "En-tête"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/it.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Titolo",
"info": "Per visualizzare il menu è necessario un titolo."
"label": "Titolo"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/ja.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "見出し",
"info": "メニューを表示するには見出しが必要です。"
"label": "見出し"
},
"menu": {
"label": "メニュー",
Expand Down
3 changes: 1 addition & 2 deletions locales/ko.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "제목",
"info": "메뉴를 표시하려면 제목은 필수 사항입니다."
"label": "제목"
},
"menu": {
"label": "메뉴",
Expand Down
3 changes: 1 addition & 2 deletions locales/nb.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Meny",
"settings": {
"heading": {
"label": "Overskrift",
"info": "Overskrift kreves for å vise menyen."
"label": "Overskrift"
},
"menu": {
"label": "Meny",
Expand Down
3 changes: 1 addition & 2 deletions locales/nl.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Opschrift",
"info": "Hoofdtekst verplicht om menu weer te geven"
"label": "Opschrift"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/pl.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Nagłówek",
"info": "Do wyświetlenia menu wymagany jest nagłówek."
"label": "Nagłówek"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/pt-BR.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Título",
"info": "Título necessário para exibir o menu."
"label": "Título"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/pt-PT.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "Cabeçalho",
"info": "É necessário um título para apresentar o menu."
"label": "Cabeçalho"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/sv.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "Rubrik",
"info": "Det krävs rubrik för att visa menyn."
"label": "Rubrik"
},
"menu": {
"label": "Meny",
Expand Down
3 changes: 1 addition & 2 deletions locales/th.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "หัวเรื่อง",
"info": "ต้องมีหัวเรื่องหากต้องการแสดงเมนู"
"label": "หัวเรื่อง"
},
"menu": {
"label": "เมนู",
Expand Down
3 changes: 1 addition & 2 deletions locales/tr.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menü",
"settings": {
"heading": {
"label": "Başlık",
"info": "Menünün gösterilmesi için başlık gereklidir."
"label": "Başlık"
},
"menu": {
"label": "Menü",
Expand Down
3 changes: 1 addition & 2 deletions locales/vi.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,7 @@
"name": "Menu",
"settings": {
"heading": {
"label": "Tiêu đề",
"info": "Bắt buộc phải có tiêu đề để hiển thị menu."
"label": "Tiêu đề"
},
"menu": {
"label": "Menu",
Expand Down
3 changes: 1 addition & 2 deletions locales/zh-CN.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "标题",
"info": "需要具有标题才能显示菜单。"
"label": "标题"
},
"menu": {
"label": "菜单",
Expand Down
3 changes: 1 addition & 2 deletions locales/zh-TW.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,8 +691,7 @@
"link_list": {
"settings": {
"heading": {
"label": "標題",
"info": "若要顯示選單，則必須要有標題。"
"label": "標題"
},
"menu": {
"label": "選單",
Expand Down
7 changes: 3 additions & 4 deletions sections/footer.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
-%}
<div class="footer__blocks-wrapper grid grid--1-col grid--2-col grid--4-col-tablet {{ footer_grid_class }}">
{%- for block in section.blocks -%}
<div class="footer-block grid__item{% if block.type == 'link_list' and block.settings.heading != blank %} footer-block--menu{% endif %}" {{ block.shopify_attributes }}>
<div class="footer-block grid__item{% if block.type == 'link_list' %} footer-block--menu{% endif %}" {{ block.shopify_attributes }}>
{%- if block.settings.heading != blank -%}
<h2 class="footer-block__heading">{{- block.settings.heading | escape -}}</h2>
{%- endif -%}
Expand All @@ -62,7 +62,7 @@
{{ block.settings.subtext }}
</div>
{%- when 'link_list' -%}
{%- if block.settings.menu != blank and block.settings.heading != blank -%}
{%- if block.settings.menu != blank -%}
<ul class="footer-block__details-content list-unstyled">
{%- for link in block.settings.menu.links -%}
<li>
Expand Down Expand Up @@ -402,8 +402,7 @@
"type": "text",
"id": "heading",
"default": "Quick links",
allylane marked this conversation as resolved.
Show resolved Hide resolved
"label": "t:sections.footer.blocks.link_list.settings.heading.label",
"info": "t:sections.footer.blocks.link_list.settings.heading.info"
"label": "t:sections.footer.blocks.link_list.settings.heading.label"
},
{
"type": "link_list",
Expand Down