From 1555a8eef308fbbfef68c66816c24c6ddb7fae73 Mon Sep 17 00:00:00 2001
From: Arend Peter Castelein <apc1993@gmail.com>
Date: Sun, 22 Dec 2024 11:49:16 -0800
Subject: [PATCH 1/6] Update en.yaml

---
 packages/frontend/src/i18n/en.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/src/i18n/en.yaml b/packages/frontend/src/i18n/en.yaml
index d2f281a4..9f3ae0c6 100644
--- a/packages/frontend/src/i18n/en.yaml
+++ b/packages/frontend/src/i18n/en.yaml
@@ -849,6 +849,8 @@ about:
       github_image_id: 109088909
     - github_user_name: csamuele
       github_image_id: 25678380
+    - github_user_name: fsargent
+      github_image_id: 273880
 
   contribute_title: Contribute
   contribute_description: >
@@ -1202,4 +1204,4 @@ time_zones:
     Asia/Kolkata: Mumbai, Kolkata, New Delhi
     Europe/Kiev: Kiev
     America/Tegucigalpa: Tegucigalpa
-    Pacific/Apia: Independent State of Samoa
\ No newline at end of file
+    Pacific/Apia: Independent State of Samoa

From df299bd5e8dc7eac7cef2d2c4ed1f1d4b03576de Mon Sep 17 00:00:00 2001
From: Arend Peter <apc1993@gmail.com>
Date: Sun, 22 Dec 2024 12:05:40 -0800
Subject: [PATCH 2/6] Change default font back to verdana (keep Montserrat
 elsewhere)

---
 packages/frontend/src/theme.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/theme.tsx b/packages/frontend/src/theme.tsx
index 3cbc7093..9e8dfb32 100644
--- a/packages/frontend/src/theme.tsx
+++ b/packages/frontend/src/theme.tsx
@@ -164,7 +164,7 @@ const brandPalette: PaletteOptions = {
 
 const brandTypography: TypographyOptions = {
    // fontFamily: 'Montserrat',
-   fontFamily: 'Montserrat, Verdana, sans-serif',
+   fontFamily: 'Verdana, sans-serif',
    button:{
      fontFamily: 'Montserrat, Verdana, sans-serif',
    },

From 47d93ebabc4ab97b2706cd7632f4c10c9d1dfb5a Mon Sep 17 00:00:00 2001
From: Felix Sargent <felix.sargent@gmail.com>
Date: Sun, 22 Dec 2024 12:14:37 -0800
Subject: [PATCH 3/6] Restore maxwidth to pricing options

---
 .../LandingPage/LandingPagePricing.tsx          | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/frontend/src/components/LandingPage/LandingPagePricing.tsx b/packages/frontend/src/components/LandingPage/LandingPagePricing.tsx
index f12cfacd..a4a0689f 100644
--- a/packages/frontend/src/components/LandingPage/LandingPagePricing.tsx
+++ b/packages/frontend/src/components/LandingPage/LandingPagePricing.tsx
@@ -4,12 +4,12 @@ import { useThemeSelector } from '../../theme'
 import { useOnScrollAnimator, useSubstitutedTranslation } from '../util'
 
 export default () => {
-    
+
     const themeSelector = useThemeSelector()
 
-    const {t} = useSubstitutedTranslation();
+    const { t } = useSubstitutedTranslation();
     const options = t('landing_page.pricing.items')
-    const {FadeIn, FadeUp} = useOnScrollAnimator();
+    const { FadeIn, FadeUp } = useOnScrollAnimator();
 
     return <FadeIn>
         <Box sx={{
@@ -18,27 +18,28 @@ export default () => {
             backgroundColor: 'darkShade.main',
             clip: 'unset',
             width: '100%',
-            p: { xs: 2},
+            p: { xs: 2 },
         }}>
             <Box sx={{
                 width: '100%',
                 maxWidth: '1300px',
                 margin: 'auto',
             }}>
-                <Typography variant='h4'color={'darkShade.contrastText'}  sx={{textAlign: 'center'}}>{t('landing_page.pricing.title')}</Typography>
+                <Typography variant='h4' color={'darkShade.contrastText'} sx={{ textAlign: 'center' }}>{t('landing_page.pricing.title')}</Typography>
             </Box>
             <Box sx={{
                 display: 'flex',
                 flexDirection: 'row',
                 gap: '5rem',
-                p: { xs: 4},
+                p: { xs: 4 },
                 justifyContent: 'center',
                 flexWrap: 'wrap',
             }}>
-                {options.map((option, i) => 
-                    <FadeUp key={i} delay={`${200+i*300}ms`}>
+                {options.map((option, i) =>
+                    <FadeUp key={i} delay={`${200 + i * 300}ms`}>
                         <Paper key={i} className='pricingOption' elevation={8} sx={{
                             width: '100%',
+                            maxWidth: '25rem',
                             display: 'flex',
                             flexDirection: 'column',
                             flexShrink: '0',

From 2b4a867561b871339b189e68998414e8720d7a5c Mon Sep 17 00:00:00 2001
From: Arend Peter <apc1993@gmail.com>
Date: Sun, 22 Dec 2024 12:19:29 -0800
Subject: [PATCH 4/6] Disable montserrate import

---
 packages/frontend/index.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/frontend/index.html b/packages/frontend/index.html
index fab9bea0..5dda1b93 100644
--- a/packages/frontend/index.html
+++ b/packages/frontend/index.html
@@ -22,7 +22,8 @@
     <link rel="manifest" href="/manifest.json" />
     <!-- Importing for ballot bubble font-->
     <link href='https://fonts.googleapis.com/css?family=Archivo Black' rel='stylesheet'>
-    <link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet">
+    <!-- The imported montserrat is different from the system one, so I'm disabling the import for now-->
+    <!-- <link href="https://fonts.googleapis.com/css2?family=Montserrat&display=swap" rel="stylesheet"> -->
     <!--
       Notice the use of  in the tags above.
       It will be replaced with the URL of the `public` folder during the build.

From fde8f71f92c3c9c2f8cc3ad3af192fcd1f093169 Mon Sep 17 00:00:00 2001
From: Arend Peter Castelein <apc1993@gmail.com>
Date: Sun, 22 Dec 2024 12:37:38 -0800
Subject: [PATCH 5/6] Update en.yaml

---
 packages/frontend/src/i18n/en.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/frontend/src/i18n/en.yaml b/packages/frontend/src/i18n/en.yaml
index 9f3ae0c6..c3ab1256 100644
--- a/packages/frontend/src/i18n/en.yaml
+++ b/packages/frontend/src/i18n/en.yaml
@@ -851,6 +851,8 @@ about:
       github_image_id: 25678380
     - github_user_name: fsargent
       github_image_id: 273880
+    - github_user_name: mickaelfo
+      github_image_id: 131360984
 
   contribute_title: Contribute
   contribute_description: >

From 8170626ea11173783267e75b0bf8450c56ffdf3d Mon Sep 17 00:00:00 2001
From: mickaelfo <131360984+mickaelfo@users.noreply.github.com>
Date: Sun, 22 Dec 2024 18:00:37 -0300
Subject: [PATCH 6/6] Update pt-BR.yaml

Correction of grammatical error.
---
 packages/frontend/src/i18n/pt-BR.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontend/src/i18n/pt-BR.yaml b/packages/frontend/src/i18n/pt-BR.yaml
index b6dd3d36..679804e8 100644
--- a/packages/frontend/src/i18n/pt-BR.yaml
+++ b/packages/frontend/src/i18n/pt-BR.yaml
@@ -162,7 +162,7 @@ methods:
 
 # Confirmation (after you've submitted a ballot)
 ballot_submitted:
-  title: '{{capital_ballot}} Enviado'
+  title: '{{capital_ballot}} Enviada'
   description: Obrigado por votar!
   results: Resultados
   donate: Doe para Equal Vote para apoiar software de votação de código aberto