Skip to content

Commit

Permalink
Merge branch 'develop' into task/sdpap-8247-update-twitter-icon
Browse files Browse the repository at this point in the history
  • Loading branch information
waitingallday authored Oct 18, 2023
2 parents ce080ad + a9b4d7b commit 37a902b
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 51 deletions.
1 change: 1 addition & 0 deletions packages/nuxt-ripple/composables/use-tide-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
})
Expand Down
10 changes: 5 additions & 5 deletions packages/nuxt-ripple/mapping/site/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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'
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,11 @@ export const SingleTemplate = (args) => ({
text: '@legacytwitterhandle',
url: 'https:/t',
icon: 'icon-twitter'
},
{
text: '',
url: '',
icon: 'icon-browser'
}
]
}}
Expand Down
60 changes: 30 additions & 30 deletions packages/ripple-ui-core/src/components/list/RplList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -62,44 +62,44 @@ const handleClick = (item: IRplListItemArray, index: number) => {
:class="['rpl-list__items', containerClass ? containerClass : null]"
:data-depth="depth"
>
<li
v-for="(item, index) of items"
:key="index"
:class="['rpl-list__item', itemClass ? itemClass : null]"
>
<RplTextLink
v-if="item.url"
:id="withLinkIds ? item.id : undefined"
:url="item.url"
class="rpl-list__link"
@click="() => handleClick(item, index)"
<template v-for="(item, index) of items" :key="index">
<li
v-if="item.url || item.text"
:class="['rpl-list__item', itemClass ? itemClass : null]"
>
<RplTextLink
v-if="item.url"
:id="withLinkIds ? item.id : undefined"
:url="item.url"
class="rpl-list__link"
@click="() => handleClick(item, index)"
>
<RplListContent
:icon-name="item?.icon"
:icon-colour="item?.iconColour"
:icon-placement="iconPlacement"
:depth="depth"
>
{{ item.text }}
</RplListContent>
</RplTextLink>
<RplListContent
v-else
:icon-name="item?.icon"
:icon-colour="item?.iconColour"
:icon-placement="iconPlacement"
:depth="depth"
>
{{ item.text }}
</RplListContent>
</RplTextLink>
<RplListContent
v-else
:icon-name="item?.icon"
:icon-colour="item?.iconColour"
:icon-placement="iconPlacement"
:depth="depth"
>
{{ item.text }}
</RplListContent>
<RplList
v-if="shouldRenderChildren && item.items"
:key="`${depth}-${index}`"
:items="item.items"
:item-class="itemClass"
container-class="rpl-list__items--sub"
:depth="depth + 1"
></RplList>
</li>
<RplList
v-if="shouldRenderChildren && item.items"
:key="`${depth}-${index}`"
:items="item.items"
:item-class="itemClass"
container-class="rpl-list__items--sub"
:depth="depth + 1"
></RplList></li
></template>
</component>
</template>
18 changes: 4 additions & 14 deletions packages/ripple-ui-core/src/styles/utilities/_typography.css
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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));
}

Expand All @@ -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) {
Expand All @@ -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));
}

Expand All @@ -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) {
Expand All @@ -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));
}

Expand All @@ -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) {
Expand All @@ -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));
}

Expand All @@ -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) {
Expand All @@ -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));
}

Expand All @@ -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) {
Expand All @@ -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));
}

Expand All @@ -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) {
Expand All @@ -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));
}

Expand Down Expand Up @@ -307,3 +293,7 @@ html {
color: var(--rpl-clr-type-default) !important;
}
}

.rpl-u-hyphenate {
hyphens: auto;
}
4 changes: 2 additions & 2 deletions packages/ripple-ui-core/stories/typography.stories.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ export const ListsTemplate = (args) => ({
template: `
<section style="display:flex;justify-content:space-between">
<div class="rpl-u-padding-3" style="width:50%;max-width:240px;background:var(--rpl-clr-accent-alt)">
<h1 class="rpl-type-h1" style="hyphens:none">An inappropriately long title to demonstrate hyphenation on a small screen.</h1>
<h1 class="rpl-type-h1">An inappropriately long title to demonstrate hyphenation on a small screen.</h1>
</div>
<div class="rpl-u-padding-3" style="width:50%;max-width:240px;background:var(--rpl-clr-accent-alt)">
<h1 class="rpl-type-h1">An inappropriately long title to demonstrate hyphenation on a small screen.</h1>
<h1 class="rpl-type-h1 rpl-u-hyphenate">An inappropriately long title to demonstrate hyphenation on a small screen.</h1>
</div>
</section>
`
Expand Down

0 comments on commit 37a902b

Please sign in to comment.