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

Footer adjustments #111

Merged
merged 3 commits into from
Mar 5, 2024
Merged

Footer adjustments #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
60fb13f
Fix footer link
Lucieo Mar 5, 2024
70dbe38
Add caisse des dépots logo
Lucieo Mar 5, 2024
bd719b4
Fix conflicts
Lucieo Mar 5, 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 back/extensions/documentation/documentation/1.0.0/full_documentation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"name": "Apache 2.0",
"url": "https://www.apache.org/licenses/LICENSE-2.0.html"
},
"x-generation-date": "03/04/2024 7:16:07 PM"
"x-generation-date": "03/05/2024 1:43:37 PM"
},
"x-strapi-config": {
"path": "/documentation",
Expand Down
6 changes: 5 additions & 1 deletion web/components/Footer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,11 @@ const Footer = () => {
>
<Box maxW={{ base: 'auto', lg: '26rem' }}>
<Text fontFamily="mabry medium">{t('footer.title')}</Text>
<Text mb={7}>{t('footer.subtitle')}</Text>
<Text mt={4}>{t('footer.subtitle_first')}</Text>
<Image src="/assets/img/partners/cdd.svg" width={'170px'} />
<Text mt={4} mb={7}>
{t('footer.subtitle_second')}
</Text>
<SimpleGrid
columns={3}
maxW="20rem"
Expand Down
2 changes: 1 addition & 1 deletion web/components/FooterMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const FooterMenu = () => {
<MenuItem href={ROUTE_PROJECT} text={t('nav.project')} />
{currentCampaign?.article_link && (
<MenuItem
href={ROUTE_PLACES}
href={currentCampaign?.article_link}
text={t('nav.campaign', { title: currentCampaign?.title })}
/>
)}
Expand Down
9 changes: 9 additions & 0 deletions web/public/assets/img/partners/cdd.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion web/public/locales/fr/common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@
},
"footer": {
"title": "StudioD · Plateforme solidaire de mise à disposition de studios de danse",
"subtitle": "Un projet conçu et porté par l'Atelier de Paris / CDCN avec le soutien de ses partenaires :",
"subtitle_first": "StudioD Emergence reçoit le soutien du mécénat de la Caisse des Dépôts",
"subtitle_second": "Le projet a été conçu au printemps 2020. Il est porté par l'Atelier de Paris / CDCN avec le soutien de ses partenaires :",
"plan": "Plan du site",
"social": "Suivez-nous sur les réseaux sociaux",
"license": "Plateforme diffusée sous license {{name}} dont le code est publié sur <a>Github</a>, droits des textes et photographies réservés"
Expand Down
Loading