diff --git a/packages/nuxt-ripple/composables/use-tide-page.ts b/packages/nuxt-ripple/composables/use-tide-page.ts index fbd58b47d8..f9370f45df 100644 --- a/packages/nuxt-ripple/composables/use-tide-page.ts +++ b/packages/nuxt-ripple/composables/use-tide-page.ts @@ -88,6 +88,7 @@ export const useTidePage = async ( case '305': case '307': await navigateTo(data.value.redirect_url, { + replace: true, redirectCode: data.value.status_code, external: data.value.redirect_type === 'external' }) diff --git a/packages/nuxt-ripple/mapping/site/index.ts b/packages/nuxt-ripple/mapping/site/index.ts index a8ce0031de..595cd8945a 100644 --- a/packages/nuxt-ripple/mapping/site/index.ts +++ b/packages/nuxt-ripple/mapping/site/index.ts @@ -49,10 +49,9 @@ export default { footerLogos: (src: any) => { return src.field_site_footer_logos.map((logo) => { const link = getLinkFromField(logo, 'field_paragraph_cta') - const image = getImageFromField( - logo, - 'field_paragraph_media.field_media_image' - ) + const image = + getImageFromField(logo, 'field_paragraph_media.field_media_image') || + getImageFromField(logo, 'field_feature_image') return { alt: link?.text, @@ -126,6 +125,7 @@ export default { 'field_top_corner_graphic', 'field_bottom_corner_graphic', 'field_site_footer_logos', - 'field_site_footer_logos.field_paragraph_media.field_media_image' + 'field_site_footer_logos.field_paragraph_media.field_media_image', + 'field_site_footer_logos.field_feature_image' ] } diff --git a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx index 84c1007ce2..38e37dbc29 100644 --- a/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx +++ b/packages/ripple-ui-core/src/components/contact-us/RplContactUs.stories.mdx @@ -76,6 +76,11 @@ export const SingleTemplate = (args) => ({ text: '@legacytwitterhandle', url: 'https:/t', icon: 'icon-twitter' + }, + { + text: '', + url: '', + icon: 'icon-browser' } ] }} diff --git a/packages/ripple-ui-core/src/components/list/RplList.vue b/packages/ripple-ui-core/src/components/list/RplList.vue index 8b0fc6a9fb..df73feeac1 100644 --- a/packages/ripple-ui-core/src/components/list/RplList.vue +++ b/packages/ripple-ui-core/src/components/list/RplList.vue @@ -62,19 +62,29 @@ const handleClick = (item: IRplListItemArray, index: number) => { :class="['rpl-list__items', containerClass ? containerClass : null]" :data-depth="depth" > -
  • - +
  • + + + {{ item.text }} + + { > {{ item.text }} - - - {{ item.text }} - - -
  • + diff --git a/packages/ripple-ui-core/src/styles/utilities/_typography.css b/packages/ripple-ui-core/src/styles/utilities/_typography.css index cf84308015..40293d5688 100644 --- a/packages/ripple-ui-core/src/styles/utilities/_typography.css +++ b/packages/ripple-ui-core/src/styles/utilities/_typography.css @@ -20,7 +20,6 @@ html { color: var(--rpl-clr-type-accent-contrast); background-color: var(--rpl-clr-accent); box-decoration-break: clone; - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -40,7 +39,6 @@ html { color: var(--rpl-clr-type-accent-contrast); background-color: var(--rpl-clr-accent); box-decoration-break: clone; - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -51,7 +49,6 @@ html { line-height: var(--rpl-type-lh-7); letter-spacing: var(--rpl-type-ls-5); color: var(--rpl-clr-primary); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -67,7 +64,6 @@ html { line-height: var(--rpl-type-lh-7); letter-spacing: var(--rpl-type-ls-5); color: var(--rpl-clr-primary); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -78,7 +74,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-6); letter-spacing: var(--rpl-type-ls-4); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -93,7 +88,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-6); letter-spacing: var(--rpl-type-ls-4); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -108,7 +102,6 @@ html { color: var(--rpl-clr-type-primary-contrast); background-color: var(--rpl-clr-primary); box-decoration-break: clone; - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -129,7 +122,6 @@ html { color: var(--rpl-clr-type-primary-contrast); background-color: var(--rpl-clr-primary); box-decoration-break: clone; - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -139,7 +131,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-5); letter-spacing: var(--rpl-type-ls-2); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -154,7 +145,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-5); letter-spacing: var(--rpl-type-ls-2); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -165,7 +155,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-4); letter-spacing: var(--rpl-type-ls-1); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -180,7 +169,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-4); letter-spacing: var(--rpl-type-ls-1); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -191,7 +179,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-3); letter-spacing: var(--rpl-type-ls-1); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); @media (--rpl-bp-l) { @@ -206,7 +193,6 @@ html { font-weight: var(--rpl-type-weight-bold); line-height: var(--rpl-type-lh-3); letter-spacing: var(--rpl-type-ls-1); - hyphens: auto; font-family: var(--rpl-type-font-family-heading, var(--rpl-type-font-family)); } @@ -307,3 +293,7 @@ html { color: var(--rpl-clr-type-default) !important; } } + +.rpl-u-hyphenate { + hyphens: auto; +} diff --git a/packages/ripple-ui-core/stories/typography.stories.mdx b/packages/ripple-ui-core/stories/typography.stories.mdx index eb7e37540e..33fc2d9380 100644 --- a/packages/ripple-ui-core/stories/typography.stories.mdx +++ b/packages/ripple-ui-core/stories/typography.stories.mdx @@ -123,10 +123,10 @@ export const ListsTemplate = (args) => ({ template: `
    -

    An inappropriately long title to demonstrate hyphenation on a small screen.

    +

    An inappropriately long title to demonstrate hyphenation on a small screen.

    -

    An inappropriately long title to demonstrate hyphenation on a small screen.

    +

    An inappropriately long title to demonstrate hyphenation on a small screen.

    `