Merge branch 'main' into remove-fadein

Equal-Vote · Dec 23, 2024 · e2fb265 · e2fb265
2 parents 9fc9dc4 + f30dc59
commit e2fb265
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git 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.

diff --git a/packages/frontend/src/components/LandingPage/LandingPagePricing.tsx b/packages/frontend/src/components/LandingPage/LandingPagePricing.tsx
@@ -5,6 +5,7 @@ import { useSubstitutedTranslation } from '../util'
 
 export default () => {
     const themeSelector = useThemeSelector()
+
     const { t } = useSubstitutedTranslation();
     const options = t('landing_page.pricing.items')
 

diff --git a/packages/frontend/src/i18n/en.yaml b/packages/frontend/src/i18n/en.yaml
@@ -849,6 +849,10 @@ about:
       github_image_id: 109088909
     - github_user_name: csamuele
       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: >
@@ -1202,4 +1206,4 @@ time_zones:
     Asia/Kolkata: Mumbai, Kolkata, New Delhi
     Europe/Kiev: Kiev
     America/Tegucigalpa: Tegucigalpa
-    Pacific/Apia: Independent State of Samoa
+    Pacific/Apia: Independent State of Samoa
diff --git 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

diff --git 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',
    },