fixed the issue of having different button heights

DTS-STN · Nov 5, 2024 · 1fbf706 · 1fbf706
1 parent d4160cf
commit 1fbf706
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/components/Forms/Button.tsx b/components/Forms/Button.tsx
@@ -18,7 +18,8 @@ interface ButtonProps {
 type ButtonType = 'submit' | 'reset' | 'button'
 
 const BUTTON_STYLES = {
-  primary: 'text-white bg-[#26374A] hover:bg-[#2B4380] focus:bg-[#0535D2]',
+  primary:
+    'text-white bg-[#26374A] hover:bg-[#2B4380] focus:bg-[#0535D2] border-transparent border-[2px]',
   secondary:
     'text-[#2B4380] focus:text-white bg-white hover:bg-[#D7E5F5] focus:bg-[#0535D2] border-[#2B4380] border-[2px]',
   supertask: 'text-white bg-[#318000] hover:bg-[#1D4D00] focus:bg-[#1D4D00]',
@@ -41,7 +42,7 @@ export const Button: React.FC<ButtonProps> = ({
 }) => {
   const btnStyle = BUTTON_STYLES[style]
 
-  const classes = `${btnStyle} ${custom} flex flex-row focus:ring focus:ring-offset-4 ring-[#0E62C9] py-2 px-4 w-fit font-lato font-[400] text-[20px] leading-[33px] rounded-md`
+  const classes = `${btnStyle} ${custom} h-stepper-button flex flex-row focus:ring focus:ring-offset-4 ring-[#0E62C9] py-2 px-4 w-fit font-[500] text-[20px] leading-[24px] rounded-md`
 
   return href ? (
     <Link href={href} locale={locale}>

diff --git a/i18n/api/en.ts b/i18n/api/en.ts
@@ -290,7 +290,7 @@ const en: Translations = {
       // },
       {
         key: PartnerBenefitStatus.OAS_GIS,
-        text: 'Yes, my partner receives the Old Age Security pension',
+        text: 'Yes',
         shortText: 'Yes',
       },
       // {
@@ -300,7 +300,7 @@ const en: Translations = {
       // },
       {
         key: PartnerBenefitStatus.NONE,
-        text: 'No, my partner does not receive the Old Age Security pension',
+        text: 'No',
         shortText: 'No',
       },
       {

diff --git a/i18n/api/fr.ts b/i18n/api/fr.ts
@@ -300,7 +300,7 @@ const fr: Translations = {
       // },
       {
         key: PartnerBenefitStatus.OAS_GIS,
-        text: 'Oui, mon conjoint reçoit la pension de la Sécurité de la vieillesse',
+        text: 'Oui',
         shortText: 'Oui',
       },
       // {
@@ -310,7 +310,7 @@ const fr: Translations = {
       // },
       {
         key: PartnerBenefitStatus.NONE,
-        text: 'Non, mon conjoint ne reçoit pas la pension de la Sécurité de la vieillesse',
+        text: 'Non',
         shortText: 'Non',
       },
       {

diff --git a/tailwind.config.js b/tailwind.config.js
@@ -118,6 +118,9 @@ module.exports = {
         'sans': '"Noto Sans", sans-serif',
         'input-label': '"Noto Sans", font-mono',
       },
+      height: {
+        'stepper-button': '48px',
+      },
       minHeight: {
         9: '36px',
       },