diff --git a/components/billboard/billboard.config.yml b/components/billboard/billboard.config.yml index 16200035b..28ec8125b 100644 --- a/components/billboard/billboard.config.yml +++ b/components/billboard/billboard.config.yml @@ -1,6 +1,6 @@ preview: '@preview-unpadded' context: - title: Example headline with 35 characters + heading: Example headline with 35 characters desc: A description with a maximum of 100 characters. That usually means only one or two sentences. cta: Learn more cta_link: '#' diff --git a/components/billboard/billboard.html b/components/billboard/billboard.html index 7cca6f186..f93246fe0 100644 --- a/components/billboard/billboard.html +++ b/components/billboard/billboard.html @@ -3,8 +3,8 @@ # parameters: # class - string # image - path -# title - string -# title_el - HTML heading element (h1, h2, h3, h4, h5, h6) +# heading - string +# heading_el - HTML heading element (h1, h2, h3, h4, h5, h6) # desc - string # cta - string # cta_link - url @@ -16,7 +16,7 @@
- <{{ title_el | default('h2') }} class="mzp-c-billboard-heading">{{ title }} + <{{ heading_el | default('h2') }} class="mzp-c-billboard-heading">{{ heading }} {%- if desc %}

{{ desc }}

{% endif -%} diff --git a/components/branding/zap/zap--all-styles.html b/components/branding/zap/zap--all-styles.html index f45b3d5d2..e6dc5668a 100644 --- a/components/branding/zap/zap--all-styles.html +++ b/components/branding/zap/zap--all-styles.html @@ -1,18 +1,18 @@ -{% render '@zap', { title_el: 'h2', zap_number: '1', title: 'An example of Zap 1' } %} -{% render '@zap', { title_el: 'h2', zap_number: '2', title: 'An example of Zap 2' } %} -{% render '@zap', { title_el: 'h2', zap_number: '3', title: 'An example of Zap 3' } %} -{% render '@zap', { title_el: 'h2', zap_number: '4', title: 'An example of Zap 4' } %} -{% render '@zap', { title_el: 'h2', zap_number: '5', title: 'An example of Zap 5' } %} -{% render '@zap', { title_el: 'h2', zap_number: '6', title: 'An example of Zap 6' } %} -{% render '@zap', { title_el: 'h2', zap_number: '7', title: 'An example of Zap 7' } %} -{% render '@zap', { title_el: 'h2', zap_number: '8', title: 'An example of Zap 8' } %} -{% render '@zap', { title_el: 'h2', zap_number: '9', title: 'An example of Zap 9' } %} -{% render '@zap', { title_el: 'h2', zap_number: '10', title: 'An example of Zap 10' } %} -{% render '@zap', { title_el: 'h2', zap_number: '11', title: 'An example of Zap 11' } %} -{% render '@zap', { title_el: 'h2', zap_number: '12', title: 'An example of Zap 12' } %} -{% render '@zap', { title_el: 'h2', zap_number: '13', title: 'An example of Zap 13' } %} -{% render '@zap', { title_el: 'h2', zap_number: '14', title: 'An example of Zap 14' } %} -{% render '@zap', { title_el: 'h2', zap_number: '15', title: 'An example of Zap 15' } %} -{% render '@zap', { title_el: 'h2', zap_number: '16', title: 'An example of Zap 16' } %} -{% render '@zap', { title_el: 'h2', zap_number: '17', title: 'An example of Zap 17' } %} -{% render '@zap', { title_el: 'h2', zap_number: '18', title: 'An example of Zap 18' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '1', heading: 'An example of Zap 1' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '2', heading: 'An example of Zap 2' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '3', heading: 'An example of Zap 3' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '4', heading: 'An example of Zap 4' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '5', heading: 'An example of Zap 5' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '6', heading: 'An example of Zap 6' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '7', heading: 'An example of Zap 7' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '8', heading: 'An example of Zap 8' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '9', heading: 'An example of Zap 9' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '10', heading: 'An example of Zap 10' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '11', heading: 'An example of Zap 11' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '12', heading: 'An example of Zap 12' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '13', heading: 'An example of Zap 13' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '14', heading: 'An example of Zap 14' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '15', heading: 'An example of Zap 15' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '16', heading: 'An example of Zap 16' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '17', heading: 'An example of Zap 17' } %} +{% render '@zap', { heading_el: 'h2', zap_number: '18', heading: 'An example of Zap 18' } %} diff --git a/components/branding/zap/zap.config.yml b/components/branding/zap/zap.config.yml index 8ca2051b2..e856bb420 100644 --- a/components/branding/zap/zap.config.yml +++ b/components/branding/zap/zap.config.yml @@ -1,5 +1,5 @@ context: - title_el: h1 + heading_el: h1 zap_number: 1 - title: A headline with an example zap. + heading: A headline with an example zap. diff --git a/components/branding/zap/zap.html b/components/branding/zap/zap.html index 3d96706a8..a5931732c 100644 --- a/components/branding/zap/zap.html +++ b/components/branding/zap/zap.html @@ -1,8 +1,8 @@ {# @zap # # parameters: -# title_el - HTML heading (h1, h2, h3, h4, h5, h6) +# heading_el - HTML heading (h1, h2, h3, h4, h5, h6) # zap_number - Zap class suffix (1—18) -# title - string +# heading - string #} -<{{ title_el | default('h1') }} class="mzp-has-zap-{{ zap_number | default('1') }}">{{ title | safe }} +<{{ heading_el | default('h1') }} class="mzp-has-zap-{{ zap_number | default('1') }}">{{ heading | safe }} diff --git a/components/callout/callout.config.yml b/components/callout/callout.config.yml index 166a3b9ea..4e8ee8905 100644 --- a/components/callout/callout.config.yml +++ b/components/callout/callout.config.yml @@ -1,7 +1,7 @@ preview: '@preview-unpadded' context: - title: A Headline With 30 Characters - title_el: h1 + heading: A Headline With 30 Characters + heading_el: h1 desc: A description of about 150 characters, give or take. Because this text is centered it works best with a tagline or brief intro, just a sentence or two. cta: False image: False diff --git a/components/callout/callout.html b/components/callout/callout.html index 65c4750ed..5afdb1a57 100644 --- a/components/callout/callout.html +++ b/components/callout/callout.html @@ -3,9 +3,9 @@ # parameters: # class - string # content_class - string -# title - string -# title_el - HTML heading element (h1, h2, h3, h4, h5, h6) -# title_class - string +# heading - string +# heading_el - HTML heading element (h1, h2, h3, h4, h5, h6) +# heading_class - string # desc - string # cta - string # cta_link - url @@ -14,7 +14,7 @@
- <{{ title_el | default('h2') }} class="mzp-c-callout-heading{% if title_class %} {{ title_class }}{% endif %}">{{ title }} + <{{ heading_el | default('h2') }} class="mzp-c-callout-heading{% if heading_class %} {{ heading_class }}{% endif %}">{{ heading }} {%- if desc %}

{{ desc }}

diff --git a/components/card/card.config.yml b/components/card/card.config.yml index 8ea0f81b2..360f4a4c1 100644 --- a/components/card/card.config.yml +++ b/components/card/card.config.yml @@ -5,7 +5,7 @@ context: link: https://example.com image: '/img/image-3-2.jpg' tag: Card tag - title: Card title with about 30-40 characters + heading: Card heading with about 30-40 characters desc: A description of about 150 characters, give or take. That means we usually only have room for one or two sentences. Here is what that looks like. cta: Call to action meta: Card meta info @@ -16,7 +16,7 @@ variants: link: https://example.com image: '/img/image-1-1.jpg' tag: Audio - title: Card title with about 30-40 characters + heading: Card heading with about 30-40 characters desc: A description of about 150 characters, give or take. That means we usually only have room for one or two sentences. Here is what that looks like. cta: This call to action is 37 characters meta: false diff --git a/components/card/card.html b/components/card/card.html index 944b56ca0..e6a8f0054 100644 --- a/components/card/card.html +++ b/components/card/card.html @@ -5,8 +5,8 @@ # link - url # image - path # tag - string -# title - string -# title_el - HTML heading element (h1, h2, h3, h4, h5, h6) +# heading - string +# heading_el - HTML heading element (h1, h2, h3, h4, h5, h6) # desc - string # cta - string # meta - string @@ -18,7 +18,7 @@
{% if tag %}
{{ tag }}
{% endif %} - {% if title %}<{{ title_el | default('h2') }} class="mzp-c-card-heading">{{ title }}{% endif %} + {% if heading %}<{{ heading_el | default('h2') }} class="mzp-c-card-heading">{{ heading }}{% endif %} {% if desc %}

{{ desc }}

{% endif %} {% if cta %}

{{ cta }}

{% endif %} {% if meta %}

{{ meta }}

{% endif %} diff --git a/components/card/readme.md b/components/card/readme.md index 92b623f01..b649a97bd 100644 --- a/components/card/readme.md +++ b/components/card/readme.md @@ -1,4 +1,4 @@ -A Card is a unit of content featuring an image along with a title and description, +A Card is a unit of content featuring an image along with a heading and description, wrapped in a block-level link. Cards come in a variety of sizes, activated by adding a modifier class: @@ -18,14 +18,14 @@ size depends on the card layout: - 3-column layout: `600px` wide (low-res), `1200px` wide (high-res) - 2-column layout: `930px` wide (low-res), `1860px` wide (high-res) -In addition to the image, title, and description, cards may hold a few other +In addition to the image, heading, and description, cards may hold a few other distinct pieces of content: -- A tag, sometimes with an icon, above the title. +- A tag, sometimes with an icon, above the heading. - A Call To Action - A small meta label -A card must contain at minimum an image and either a title or a description (or -both). All other content is optional. Try to keep card titles to one or two lines +A card must contain at minimum an image and either a heading or a description (or +both). All other content is optional. Try to keep card headings to one or two lines (about 50 characters max) and descriptions to two or three lines (about 150 characters max). Tags should be short, just one or two words. Calls to Action and meta labels should fit on one line, about 30-40 characters max. diff --git a/components/forms/12-form-header/form-header.html b/components/forms/12-form-header/form-header.html index 2382d8507..5cd8537d0 100644 --- a/components/forms/12-form-header/form-header.html +++ b/components/forms/12-form-header/form-header.html @@ -1,7 +1,7 @@
-

Form Title

-

The title and this introduction are inside a form-header.

+

Form Heading

+

The heading and this introduction are inside a form-header.

{% render '@input-field', { type: 'text', label: 'Username', id: 'user', name: 'user' } %} diff --git a/components/layout/03-card-layout/02-card-layout--third.html b/components/layout/03-card-layout/02-card-layout--third.html index c65a86553..bceb23788 100644 --- a/components/layout/03-card-layout/02-card-layout--third.html +++ b/components/layout/03-card-layout/02-card-layout--third.html @@ -1,5 +1,5 @@
- {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-has-aspect-1-1', image: '/img/image-1-1.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-1-1', image: '/img/image-1-1.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %}
diff --git a/components/layout/03-card-layout/03-card-layout--quarter.html b/components/layout/03-card-layout/03-card-layout--quarter.html index 33cb0ff4c..2433fc37a 100644 --- a/components/layout/03-card-layout/03-card-layout--quarter.html +++ b/components/layout/03-card-layout/03-card-layout--quarter.html @@ -1,6 +1,6 @@
- {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-1-1', image: '/img/image-1-1.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-1-1', image: '/img/image-1-1.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %}
diff --git a/components/layout/03-card-layout/04-card-layout--hero.html b/components/layout/03-card-layout/04-card-layout--hero.html index 0217de89f..942acf883 100644 --- a/components/layout/03-card-layout/04-card-layout--hero.html +++ b/components/layout/03-card-layout/04-card-layout--hero.html @@ -1,7 +1,7 @@
- {% render '@card--large', { class: 'mzp-c-card-large mzp-has-aspect-16-9', image: '/img/image-16-9.jpg', link: '#', title: 'A large hero card', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-has-aspect-1-1', image: '/img/image-1-1.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--large', { class: 'mzp-c-card-large mzp-has-aspect-16-9', image: '/img/image-16-9.jpg', link: '#', heading: 'A large hero card', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-1-1', image: '/img/image-1-1.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--small', { class: 'mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %}
diff --git a/components/layout/03-card-layout/card-layout.html b/components/layout/03-card-layout/card-layout.html index 27ee918bf..7f654abf1 100644 --- a/components/layout/03-card-layout/card-layout.html +++ b/components/layout/03-card-layout/card-layout.html @@ -1,4 +1,4 @@
- {% render '@card--medium', { class: 'mzp-c-card-medium mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} - {% render '@card--medium', { class: 'mzp-c-card-medium mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--medium', { class: 'mzp-c-card-medium mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %} + {% render '@card--medium', { class: 'mzp-c-card-medium mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'A brief card description, just a single sentence.' } %}
diff --git a/components/navigation/02-menu/menu.html b/components/navigation/02-menu/menu.html index f7f7cede5..cf7e916ad 100644 --- a/components/navigation/02-menu/menu.html +++ b/components/navigation/02-menu/menu.html @@ -38,7 +38,7 @@
- {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', title: 'A short title', desc: 'This is an optional card included in the menu. Only visible on wide viewports.' } %} + {% render '@card--small', { class: 'mzp-c-card-small mzp-has-aspect-3-2', image: '/img/image-3-2.jpg', link: '#', heading: 'A short heading', desc: 'This is an optional card included in the menu. Only visible on wide viewports.' } %}
diff --git a/components/navigation/03-menu-item/readme.md b/components/navigation/03-menu-item/readme.md index ff7ce8175..0e63c4080 100644 --- a/components/navigation/03-menu-item/readme.md +++ b/components/navigation/03-menu-item/readme.md @@ -1,6 +1,6 @@ - Each Menu Item should have a link destination. - Adding a class of `mzp-has-icon` will allow for an icon to be displayed next - to the title. + to the heading. - Icons sizes should be `24px` x `24px`. - Icons should be an inline `` or `` with a class of `mzp-c-menu-item-icon`. - Icon, description and secondary links are all optional. diff --git a/components/picto/picto.html b/components/picto/picto.html index 76adf4930..40c88f4a4 100644 --- a/components/picto/picto.html +++ b/components/picto/picto.html @@ -3,15 +3,15 @@ # parameters: # image - path # image_width - string -# title_el - HTML heading element (h1, h2, h3, h4, h5, h6) -# title - string +# heading_el - HTML heading element (h1, h2, h3, h4, h5, h6) +# heading - string # body - string #}
- <{{ title_el | default('h3') }} class="mzp-c-picto-heading">{{ title }} + <{{ heading_el | default('h3') }} class="mzp-c-picto-heading">{{ heading }} {%- if body %}

{{ body }}

diff --git a/components/section-heading/section-heading.config.yml b/components/section-heading/section-heading.config.yml index d354b5f3b..d7616657d 100644 --- a/components/section-heading/section-heading.config.yml +++ b/components/section-heading/section-heading.config.yml @@ -1,2 +1,2 @@ context: - title: Sphinx of black quartz, judge my vow! + heading: Sphinx of black quartz, judge my vow! diff --git a/components/section-heading/section-heading.html b/components/section-heading/section-heading.html index e8d31ba53..b952a278f 100644 --- a/components/section-heading/section-heading.html +++ b/components/section-heading/section-heading.html @@ -2,6 +2,6 @@ # # parameters: # class - string -# title - string +# heading - string #} -

{{ title | safe }}

+

{{ heading | safe }}

diff --git a/components/sticky-promo/readme.md b/components/sticky-promo/readme.md index 3cc7ce7d2..26050b198 100644 --- a/components/sticky-promo/readme.md +++ b/components/sticky-promo/readme.md @@ -43,7 +43,7 @@ MzpStickyPromo.open(); - Make initialize the component *after* the DOM has loaded. - The Sticky Promo is positioned in the lower right corner in LTR languages and in the lower left corner in RTL languages. -- Add one of these product theme classes to include a logo above the title: +- Add one of these product theme classes to include a logo above the heading: - `mzp-t-product-firefox` - `mzp-t-product-beta` - `mzp-t-product-developer` diff --git a/components/sticky-promo/sticky-promo.config.yml b/components/sticky-promo/sticky-promo.config.yml index 6684af9f1..027bf9df4 100644 --- a/components/sticky-promo/sticky-promo.config.yml +++ b/components/sticky-promo/sticky-promo.config.yml @@ -1,5 +1,5 @@ context: - title: A headline with 30 characters + heading: A headline with 30 characters content: |

Some body content, but keep it short. Just a sentence or two. Maybe three at the most.

variants: @@ -9,5 +9,5 @@ variants: also features a product logo and button. context: class: 'mzp-t-dark mzp-t-product-developer' - title: Get the browser made for developers + heading: Get the browser made for developers content:

Download Now

diff --git a/components/sticky-promo/sticky-promo.html b/components/sticky-promo/sticky-promo.html index eb35f931c..03a0dac64 100644 --- a/components/sticky-promo/sticky-promo.html +++ b/components/sticky-promo/sticky-promo.html @@ -1,12 +1,12 @@ {# @sticky-promo # # parameters: -# title - string +# heading - string # content - string #}