Skip to content

fix merge issue with brand kit #157

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

Merged
merged 2 commits into from
Jan 15, 2024
Merged

fix merge issue with brand kit #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde811e
fix merge issue with brand kit
dghelm Jan 15, 2024
8dcc83a
update join us link
dghelm Jan 15, 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 public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"scrollDocsURL": "https://docs.scroll.io/",
"blog": "Blog",
"documentation": "Documentation",
"pressKit": "Press Kit"
"brandKit": "Brand Kit"
},
"followUs": {
"title": "Follow Us"
Expand Down
2 changes: 1 addition & 1 deletion public/locales/es/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"scrollDocsURL": "https://docs.scroll.io/es",
"blog": "Blog",
"documentation": "Documentación",
"pressKit": "Kit de Prensa"
"brandKit": "Kit de Marca"
},
"followUs": {
"title": "Síguenos"
Expand Down
4 changes: 2 additions & 2 deletions src/components/Footer/helper.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const aboutList = [
},
{
name: "footer.aboutScroll.joinUs",
href: "https://jobs.lever.co/ScrollFoundation",
href: "https://scroll.io/join-us",
},
{
name: "footer.aboutScroll.healthStatus",
Expand All @@ -54,7 +54,7 @@ export const resourceList = [
href: "https://docs.scroll.io/",
},
{
name: "footer.resources.pressKit",
name: "footer.resources.brandKit",
href: "https://scrollzkp.notion.site/Scroll-Rebrand-Assets-5bb83465f56f40989c4f772b39ed3a06",
},
]
Expand Down