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

219714 - Updated css for visited links #1085

Merged
merged 2 commits into from
Jun 18, 2024
Merged

219714 - Updated css for visited links #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
469032c
updated css for visited links
MarcoGoC Jun 17, 2024
26d75ef
updated svg aria
MarcoGoC Jun 18, 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
2 changes: 1 addition & 1 deletion components/Layout/Breadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export function Breadcrumb({ locale, items = [] }: BreadcrumbProps) {
className="inline-block min-w-0 max-w-full truncate -my-4"
>
<Link href={item.link} locale={locale}>
<a className="font-sans text-[16px] leading-[23px] font-[400] text-[#295376] hover:text-[#0535D2] underline">
<a className="font-sans text-[16px] leading-[23px] font-[400] !text-[#295376] hover:text-[#0535D2] underline">
{item.text}
</a>
</Link>
Expand Down
4 changes: 2 additions & 2 deletions components/Layout/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const Footer = ({ id, locale }: FooterProps) => {
} list-none w-64 sm:w-56 lg:w-80 my-1`}
>
<Link href={value.link} locale={locale}>
<a className="font-[400] text-white text-[14px] leading-[19px]">
<a className="font-[400] !text-white text-[14px] leading-[19px]">
{value.text}
</a>
</Link>
Expand All @@ -67,7 +67,7 @@ export const Footer = ({ id, locale }: FooterProps) => {
} pr-4 my-1`}
>
<Link href={value.link}>
<a className="font-[400] text-[14px] leading-[19px] text-[#31455C]">
<a className="font-[400] text-[14px] leading-[19px] !text-[#284162]">
{value.text}
</a>
</Link>
Expand Down
2 changes: 1 addition & 1 deletion components/Layout/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export function Header({
<Link href={langUrl} locale={language}>
<a
lang={language}
className="ml-6 sm:ml-16 -mt-1 underline font-lato text-[16px] leading-[23px] text-[#295376] hover:text-[#0535D2]"
className="ml-6 sm:ml-16 -mt-1 underline font-lato text-[16px] leading-[23px] !text-[#295376] hover:text-[#0535D2]"
>
<span className="md:hidden font-bold">{shortLanguageText}</span>
<span className="hidden md:inline font-[400]" data-cy="lang1">
Expand Down
6 changes: 3 additions & 3 deletions i18n/api/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,16 +445,16 @@ const en: Translations = {
youShouldHaveReceivedLetter:
'You should have received a letter about your enrolment status the month after you turned 64.',
ifYouDidnt:
"If you didn't, <a id='oasLink2' class='text-default-text' style='text-decoration: underline' target='_blank' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a> to find out if you need to apply.",
"If you didn't, <a id='oasLink2' class='text-default-text' style='text-decoration: underline' target='_blank' aria-label='opens a new tab' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a> to find out if you need to apply.",
applyOnline: "If you didn't, you can apply online.",
over70:
"If you're over the age of 70 and are not receiving an Old Age Security pension, apply now.",
eligibleWhenTurn65:
"You may be eligible for this benefit once you turn 65. You can <a class='text-default-text' style='text-decoration: underline' href='/en/questions#age'>edit your answers</a> to see what you could receive at a future age.",
ifNotReceiveLetter64:
"If you didn't, <a class='text-default-text addOpenNew' style='text-decoration: underline' target='_blank' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a> to find out if you need to apply.",
"If you didn't, <a class='text-default-text addOpenNew' style='text-decoration: underline' target='_blank' aria-label='opens a new tab' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a> to find out if you need to apply.",
chooseToDefer:
"You can choose to defer your pension or increase your years of residence in Canada. To find out which option is best for you, <a id='oasLink2' class='text-default-text' style='text-decoration: underline' target='_blank' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a>.",
"You can choose to defer your pension or increase your years of residence in Canada. To find out which option is best for you, <a id='oasLink2' class='text-default-text' style='text-decoration: underline' target='_blank' aria-label='opens a new tab' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a>.",
receivePayment:
'You may be able to receive payment for up to the last 11 months.',
},
Expand Down
6 changes: 3 additions & 3 deletions i18n/api/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,17 +455,17 @@ const fr: Translations = {
youShouldHaveReceivedLetter:
"Vous devriez avoir reçu une lettre au sujet de votre statut d'inscription le mois après votre 64e anniversaire.",
ifYouDidnt:
"Si vous ne l'avez pas reçue, <a id='oasLink2' class='text-default-text' style='text-decoration: underline' href='https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/sv.html'>communiquez avec nous</a> pour savoir si vous devez présenter une demande.",
"Si vous ne l'avez pas reçue, <a id='oasLink2' class='text-default-text' style='text-decoration: underline' target='_blank' aria-label='ouvre dans un nouvel onglet' href='https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/sv.html'>communiquez avec nous</a> pour savoir si vous devez présenter une demande.",
applyOnline:
"Si vous ne l'avez pas reçue, vous pouvez présenter une demande en ligne.",
over70:
'Si vous avez plus de 70 ans et ne recevez pas la pension la Sécurité de la vieillesse, présentez votre demande dès que possible.',
eligibleWhenTurn65:
"Vous pourriez être admissible lorsque vous aurez 65 ans. Vous pouvez <a class='text-default-text' style='text-decoration: underline' href='/fr/questions#age'>modifier vos réponses</a> pour voir ce que vous pourriez recevoir à un âge futur.",
ifNotReceiveLetter64:
"Si vous ne l'avez pas reçue, <a class='addOpenNew text-default-text' style='text-decoration: underline' target='_blank' href='https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/sv.html'>communiquez avec nous</a> pour savoir si vous devez présenter une demande.",
"Si vous ne l'avez pas reçue, <a class='addOpenNew text-default-text' style='text-decoration: underline' target='_blank' aria-label='ouvre dans un nouvel onglet' href='https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/sv.html'>communiquez avec nous</a> pour savoir si vous devez présenter une demande.",
chooseToDefer:
"Vous pouvez choisir de reporter votre pension ou augmenter vos années de résidence au Canada. Pour savoir quelle option serait la meilleure pour vous, <a class='addOpenNew text-default-text' style='text-decoration: underline' target='_blank' href='https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/sv.html'>communiquez avec nous</a>.",
"Vous pouvez choisir de reporter votre pension ou augmenter vos années de résidence au Canada. Pour savoir quelle option serait la meilleure pour vous, <a class='addOpenNew text-default-text' style='text-decoration: underline' target='_blank' aria-label='ouvre dans un nouvel onglet' href='https://www.canada.ca/fr/emploi-developpement-social/ministere/coordonnees/sv.html'>communiquez avec nous</a>.",
receivePayment:
'Vous pourriez recevoir un paiement pour un maximum des 11 derniers mois.',
},
Expand Down
4 changes: 2 additions & 2 deletions i18n/tooltips/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const en: TooltipTranslations = {
moreinfo: 'Will this income be used in your application?',
text: "<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
No, this is an estimation. Your actual <a style='text-decoration: underline; color: rgba(40, 65, 98, 1);' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank'>income and exemptions<img style='padding: 0px 0px 3px 4px; display: inline-block;' src='/openNewTab.svg'/></a> will be assessed when you apply. \
No, this is an estimation. Your actual <a class='hintText' style='text-decoration: underline;' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank' aria-label='opens a new tab'>income and exemptions</a> will be assessed when you apply. \
</p> \
</div> \
",
Expand All @@ -89,7 +89,7 @@ const en: TooltipTranslations = {
moreinfo: 'Will this income be used in your application?',
text: "<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
No, this is an estimation. Your partner’s actual <a style='text-decoration: underline; color: rgba(40, 65, 98, 1); display: flex;' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank'>income and exemptions<img style='padding: 0px 0px 3px 4px;' src='/openNewTab.svg'/></a> will be assessed when you apply. \
No, this is an estimation. Your partner’s actual <a class='hintText' style='text-decoration: underline; display: flex;' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank' aria-label='opens a new tab'>income and exemptions</a> will be assessed when you apply. \
</p> \
</div> \
",
Expand Down
8 changes: 4 additions & 4 deletions i18n/tooltips/fr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const fr: TooltipTranslations = {
moreinfo: 'Ce revenu sera-t-il utilisé dans votre demande?',
text: "<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
Non, il s’agit d’une estimation. Vos <a style='text-decoration: underline; color: rgba(40, 65, 98, 1);' href='https://www.canada.ca/fr/services/prestations/pensionspubliques/rpc/securite-vieillesse/supplement-revenu-garanti/demande.html#h2.2-3.1' target='_blank'>revenus et exemptions<img style='padding: 0px 0px 3px 4px; display: inline-block;' src='/openNewTab.svg'/></a> réels seront évalués lors de votre demande. \
Non, il s’agit d’une estimation. Vos <a class='hintText' style='text-decoration: underline;' href='https://www.canada.ca/fr/services/prestations/pensionspubliques/rpc/securite-vieillesse/supplement-revenu-garanti/demande.html#h2.2-3.1' target='_blank' aria-label='ouvre dans un nouvel onglet'>revenus et exemptions</a> réels seront évalués lors de votre demande. \
</p> \
</div> \
",
Expand All @@ -82,15 +82,15 @@ const fr: TooltipTranslations = {
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
Vos premiers 15&nbsp;000&nbsp;$ de revenu lié au travail sont sujets à des exemptions. Nous allons les calculer pour vous. \
</p> \
</div> \
</div> \
",
},
[FieldKey.PARTNER_INCOME]: {
heading: apiFr.category.income,
moreinfo: 'Ce revenu sera-t-il utilisé dans votre demande?',
text: "<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
Non, il s’agit d’une estimation. Ses <a style='text-decoration: underline; color: rgba(40, 65, 98, 1); display: flex;' href='https://www.canada.ca/fr/services/prestations/pensionspubliques/rpc/securite-vieillesse/supplement-revenu-garanti/demande.html#h2.2-3.1' target='_blank'>revenus et exemptions<img style='padding: 0px 0px 3px 4px;' src='/openNewTab.svg'/></a> réels seront évalués lors de votre demande. \
Non, il s’agit d’une estimation. Ses <a class=hintText' style='text-decoration: underline; display: flex;' href='https://www.canada.ca/fr/services/prestations/pensionspubliques/rpc/securite-vieillesse/supplement-revenu-garanti/demande.html#h2.2-3.1' target='_blank' aria-label='ouvre dans un nouvel onglet'>revenus et exemptions</a> réels seront évalués lors de votre demande. \
</p> \
</div> \
",
Expand All @@ -102,7 +102,7 @@ const fr: TooltipTranslations = {
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
Ses premiers 15&nbsp;000&nbsp;$ de revenu lié au travail sont sujets à des exemptions. Nous allons les calculer pour vous. \
</p> \
</div> \
</div> \
",
},
[FieldKey.YEARS_IN_CANADA_SINCE_18]: {
Expand Down
10 changes: 5 additions & 5 deletions i18n/web/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ const en: WebTranslations = {
'This estimator does not include the Canada Pension Plan retirement pension.',
learnMoreAboutCpp: `<a className="underline text-default-text" href="${apiEn.links.cpp.url}" target="_blank">Learn more about the Canada Pension Plan</a>`,
aboutResultText: 'About the results',
resultDefinition: `The results are not financial advice and are subject to change. For a more accurate assessment of your estimated benefits amount, please <a className='text-default-text underline' target='_blank' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a>.`,
resultDefinition: `The results are not financial advice and are subject to change. For a more accurate assessment of your estimated benefits amount, please <a className='text-default-text underline' target='_blank' aria-label='opens a new tab'href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html'>contact us</a>.`,
privacyHeading: 'Privacy',
privacyDefinition:
'We don’t collect the information you enter in the estimator.',
Expand Down Expand Up @@ -476,7 +476,7 @@ const en: WebTranslations = {
incomeHintText:
"<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
Your <a style='text-decoration: underline; color: rgba(40, 65, 98, 1);' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank'>income and exemptions<img style='padding: 0px 0px 3px 4px; display: inline-block;' src='/openNewTab.svg'/></a> will be assessed when you apply based on your latest income tax return. \
Your <a class='hintText' style='text-decoration: underline;' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank' aria-label='opens a new tab'>income and exemptions</a> will be assessed when you apply based on your latest income tax return. \
</p> \
</div> \
",
Expand All @@ -485,7 +485,7 @@ const en: WebTranslations = {
incomeHintTextReceiveOAS:
"<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
If you're expecting a drop in income, you can enter your estimated income. <a style='text-decoration: underline; color: rgba(40, 65, 98, 1);' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html' target='_blank'>Contact us<img style='padding: 0px 0px 3px 4px; display: inline-block;' src='/openNewTab.svg'/></a> to report this event. \
If you're expecting a drop in income, you can enter your estimated income. <a class='hintText' style='text-decoration: underline;' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html' target='_blank' aria-label='opens a new tab'>Contact us</a> to report this event. \
</p> \
</div> \
",
Expand All @@ -495,7 +495,7 @@ const en: WebTranslations = {
partnerIncomeHintText:
"<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
Your partner’s <a style='text-decoration: underline; color: rgba(40, 65, 98, 1);' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank'>income and exemptions<img style='padding: 0px 0px 3px 4px; display: inline-block' src='/openNewTab.svg'/></a> will be assessed when you apply based on their latest income tax return. \
Your partner’s <a class='hintText' style='text-decoration: underline;' href='https://www.canada.ca/en/services/benefits/publicpensions/cpp/old-age-security/guaranteed-income-supplement/apply.html#h2.2-3.1' target='_blank' aria-label='opens a new tab'>income and exemptions</a> will be assessed when you apply based on their latest income tax return. \
</p> \
</div> \
",
Expand All @@ -504,7 +504,7 @@ const en: WebTranslations = {
partnerIncomeHintTextReceiveOAS:
"<div style='margin-bottom: 16px;'> \
<p style='padding-bottom: 8px; color: rgba(92, 92, 92, 1);'> \
If your partner is expecting a drop in income, you can enter their estimated income. <a style='text-decoration: underline; color: rgba(40, 65, 98, 1);' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html' target='_blank'>Contact us<img style='padding: 0px 0px 3px 4px; display: inline-block' src='/openNewTab.svg'/></a> to report this event. \
If your partner is expecting a drop in income, you can enter their estimated income. <a class='hintText' style='text-decoration: underline;' href='https://www.canada.ca/en/employment-social-development/corporate/contact/oas.html' target='_blank' aria-label='opens a new tab'>Contact us</a> to report this event. \
</p> \
</div> \
",
Expand Down
Loading
Loading