From 48aa85d2c9ab4303a0d1e81fbf337440dc7aeba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Gonz=C3=A1lez=20Mu=C3=B1oz?= Date: Mon, 18 Sep 2023 18:02:36 +0200 Subject: [PATCH] fixes font color and defaults sans family --- .../publish-modal/company-uploader/component.tsx | 2 +- .../inventory-panel/cost-surfaces/modals/upload/index.tsx | 2 +- .../project/inventory-panel/features/modals/upload/index.tsx | 2 +- .../project/inventory-panel/wdpas/modals/upload/index.tsx | 2 +- .../project/sidebar/scenario/grid-setup/cost-surface/index.tsx | 2 +- .../grid-setup/features/add/add-modal/uploader/component.tsx | 2 +- .../grid-setup/planning-unit-status/actions/upload/index.tsx | 2 +- .../protected-areas/categories/pa-uploader/index.tsx | 2 +- .../legacy-upload-modal/upload-files/upload-item/component.tsx | 2 +- .../projects/all/toolbar/upload-btn/upload-modal/component.tsx | 2 +- .../new/form/planning-area-grid-uploader/component.tsx | 2 +- .../projects/new/form/planning-area-uploader/component.tsx | 2 +- app/tailwind.config.js | 3 ++- 13 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/layout/project/sidebar/project/header/project-button/publish-modal/company-uploader/component.tsx b/app/layout/project/sidebar/project/header/project-button/publish-modal/company-uploader/component.tsx index 375364cc28..bfb6820db7 100644 --- a/app/layout/project/sidebar/project/header/project-button/publish-modal/company-uploader/component.tsx +++ b/app/layout/project/sidebar/project/header/project-button/publish-modal/company-uploader/component.tsx @@ -220,7 +220,7 @@ export const CompanyUploader: React.FC = ({ or click here to upload

-

{`Recommended file size < ${bytesToKilobytes( +

{`Recommended file size < ${bytesToKilobytes( COMPANY_LOGO_UPLOADER_MAX_SIZE )} KB`}

diff --git a/app/layout/project/sidebar/project/inventory-panel/cost-surfaces/modals/upload/index.tsx b/app/layout/project/sidebar/project/inventory-panel/cost-surfaces/modals/upload/index.tsx index e7e003b94d..d9ef0803be 100644 --- a/app/layout/project/sidebar/project/inventory-panel/cost-surfaces/modals/upload/index.tsx +++ b/app/layout/project/sidebar/project/inventory-panel/cost-surfaces/modals/upload/index.tsx @@ -266,7 +266,7 @@ export const CostSurfaceUploadModal = ({ or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( COST_SURFACE_UPLOADER_MAX_SIZE )} MB`}

diff --git a/app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx b/app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx index 2992e80afd..a233151024 100644 --- a/app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx +++ b/app/layout/project/sidebar/project/inventory-panel/features/modals/upload/index.tsx @@ -410,7 +410,7 @@ export const FeatureUploadModal = ({ or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( UPLOADER_MAX_SIZE )} MB`}

diff --git a/app/layout/project/sidebar/project/inventory-panel/wdpas/modals/upload/index.tsx b/app/layout/project/sidebar/project/inventory-panel/wdpas/modals/upload/index.tsx index bdb6bf29f0..d86378f807 100644 --- a/app/layout/project/sidebar/project/inventory-panel/wdpas/modals/upload/index.tsx +++ b/app/layout/project/sidebar/project/inventory-panel/wdpas/modals/upload/index.tsx @@ -236,7 +236,7 @@ export const WDPAUploadModal = ({ or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( PROTECTED_AREA_UPLOADER_SHAPEFILE_MAX_SIZE )} MB`}

diff --git a/app/layout/project/sidebar/scenario/grid-setup/cost-surface/index.tsx b/app/layout/project/sidebar/scenario/grid-setup/cost-surface/index.tsx index 6da6a3f858..ea16954a94 100644 --- a/app/layout/project/sidebar/scenario/grid-setup/cost-surface/index.tsx +++ b/app/layout/project/sidebar/scenario/grid-setup/cost-surface/index.tsx @@ -310,7 +310,7 @@ export const GridSetupCostSurface = (): JSX.Element => { or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( COST_SURFACE_UPLOADER_MAX_SIZE )} MB`}

diff --git a/app/layout/project/sidebar/scenario/grid-setup/features/add/add-modal/uploader/component.tsx b/app/layout/project/sidebar/scenario/grid-setup/features/add/add-modal/uploader/component.tsx index aa79b18640..0bfd86ca5d 100644 --- a/app/layout/project/sidebar/scenario/grid-setup/features/add/add-modal/uploader/component.tsx +++ b/app/layout/project/sidebar/scenario/grid-setup/features/add/add-modal/uploader/component.tsx @@ -229,7 +229,7 @@ export const ScenariosFeaturesAddUploader = (): JSX.Element => { or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( FEATURES_UPLOADER_SHAPEFILE_MAX_SIZE )} MB`}

diff --git a/app/layout/project/sidebar/scenario/grid-setup/planning-unit-status/actions/upload/index.tsx b/app/layout/project/sidebar/scenario/grid-setup/planning-unit-status/actions/upload/index.tsx index 0e702f0cc6..e7911d7624 100644 --- a/app/layout/project/sidebar/scenario/grid-setup/planning-unit-status/actions/upload/index.tsx +++ b/app/layout/project/sidebar/scenario/grid-setup/planning-unit-status/actions/upload/index.tsx @@ -192,7 +192,7 @@ export const UploadPUMethod = (): JSX.Element => { Drag and drop your polygon data file
or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( PLANNING_UNIT_UPLOADER_MAX_SIZE )} MB`}

diff --git a/app/layout/project/sidebar/scenario/grid-setup/protected-areas/categories/pa-uploader/index.tsx b/app/layout/project/sidebar/scenario/grid-setup/protected-areas/categories/pa-uploader/index.tsx index 50f224d3c4..39412ecabc 100644 --- a/app/layout/project/sidebar/scenario/grid-setup/protected-areas/categories/pa-uploader/index.tsx +++ b/app/layout/project/sidebar/scenario/grid-setup/protected-areas/categories/pa-uploader/index.tsx @@ -260,7 +260,7 @@ export const ProtectedAreaUploader: React.FC = ({ or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( PROTECTED_AREA_UPLOADER_SHAPEFILE_MAX_SIZE )} MB`}

diff --git a/app/layout/projects/all/toolbar/upload-btn/legacy-upload-modal/upload-files/upload-item/component.tsx b/app/layout/projects/all/toolbar/upload-btn/legacy-upload-modal/upload-files/upload-item/component.tsx index 305ef216c5..86b312f2ae 100644 --- a/app/layout/projects/all/toolbar/upload-btn/legacy-upload-modal/upload-files/upload-item/component.tsx +++ b/app/layout/projects/all/toolbar/upload-btn/legacy-upload-modal/upload-files/upload-item/component.tsx @@ -170,7 +170,7 @@ export const UploadItem: React.FC = ({ f, input, ...fprops }: U or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( f.maxSize )} MB`}

diff --git a/app/layout/projects/all/toolbar/upload-btn/upload-modal/component.tsx b/app/layout/projects/all/toolbar/upload-btn/upload-modal/component.tsx index ea0c6ac1ec..af17a997d9 100644 --- a/app/layout/projects/all/toolbar/upload-btn/upload-modal/component.tsx +++ b/app/layout/projects/all/toolbar/upload-btn/upload-modal/component.tsx @@ -205,7 +205,7 @@ export const UploadModal: React.FC = ({ onDismiss }: UploadMod or click here to upload

-

{`Recommended file size < ${bytesToMegabytes( +

{`Recommended file size < ${bytesToMegabytes( PROJECT_UPLOADER_MAX_SIZE )} MB`}

diff --git a/app/layout/projects/new/form/planning-area-grid-uploader/component.tsx b/app/layout/projects/new/form/planning-area-grid-uploader/component.tsx index 730d465bf7..df0a05e213 100644 --- a/app/layout/projects/new/form/planning-area-grid-uploader/component.tsx +++ b/app/layout/projects/new/form/planning-area-grid-uploader/component.tsx @@ -290,7 +290,7 @@ export const PlanningAreaGridUploader: React.FC = )} -
    +
    • {`Recommended file size < ${bytesToMegabytes( PLANNING_AREA_GRID_UPLOADER_MAX_SIZE diff --git a/app/layout/projects/new/form/planning-area-uploader/component.tsx b/app/layout/projects/new/form/planning-area-uploader/component.tsx index b26fdc44b9..05205c7ec0 100644 --- a/app/layout/projects/new/form/planning-area-uploader/component.tsx +++ b/app/layout/projects/new/form/planning-area-uploader/component.tsx @@ -249,7 +249,7 @@ export const PlanningAreUploader: React.FC = ({ or click here to upload

      -

      {`Recommended file size < ${bytesToMegabytes( +

      {`Recommended file size < ${bytesToMegabytes( PLANNING_AREA_UPLOADER_MAX_SIZE )} MB`}

      diff --git a/app/tailwind.config.js b/app/tailwind.config.js index f38b713ebb..a57cc370bd 100644 --- a/app/tailwind.config.js +++ b/app/tailwind.config.js @@ -1,4 +1,5 @@ /* eslint-disable @typescript-eslint/no-var-requires */ +const defaultTheme = require('tailwindcss/defaultTheme'); const forms = require('@tailwindcss/forms')({ strategy: 'class', }); @@ -115,7 +116,7 @@ module.exports = { }, fontFamily: { heading: 'Poppins', - sans: 'Basier Circle', + sans: ['Basier Circle', ...defaultTheme.fontFamily.sans], }, fontSize: { xxs: ['0.625rem', { lineHeight: '0.75rem' }],