Skip to content
This repository has been archived by the owner on Nov 30, 2023. It is now read-only.

Connect the world reskin/UI updates #635

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions pages/_document.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ export default class MyDocument extends Document<Props> {
<link key="favicon" rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
<link rel="stylesheet" href="/fonts/JostFont.css" type="text/css" />
<link rel="stylesheet" href="/fonts/EBGaramondFont.css" type="text/css" />
<link rel="stylesheet" href="/fonts/InterFont.css" type="text/css" />
<link rel="stylesheet" href="/fonts/GTAlpinaFont.css" type="text/css" />
</Head>
<body>
<Main />
Expand Down
Binary file added public/.DS_Store
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Bold-Italic.woff
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Bold.woff
Binary file not shown.
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Light.woff
Binary file not shown.
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Medium.woff
Binary file not shown.
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Regular.woff
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Thin-Italic.woff
Binary file not shown.
Binary file added public/fonts/GT-Alpina-Standard-Thin.woff
Binary file not shown.
83 changes: 83 additions & 0 deletions public/fonts/GTAlpinaFont.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
/* GT ALPINA * */

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Thin.woff") format("woff");
font-weight: 200;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Thin-Italic.woff") format("woff");
font-weight: 200;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Light.woff") format("woff");
font-weight: 250;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Light-Italic.woff") format("woff");
font-weight: 250;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Regular.woff") format("woff");
font-weight: 400;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Regular-Italic.woff") format("woff");
font-weight: 400;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Medium.woff") format("woff");
font-weight: 500;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Medium-Italic.woff") format("woff");
font-weight: 500;
font-style: italic;
font-display: swap;
}


@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Bold.woff") format("woff");
font-weight: 700;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "GT-Alpina";
src: url("/fonts/GT-Alpina-Standard-Bold-Italic.woff") format("woff");
font-weight: 700;
font-style: italic;
font-display: swap;
}

Binary file added public/fonts/Inter-Black.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Bold.ttf
Binary file not shown.
Binary file added public/fonts/Inter-ExtraBold.ttf
Binary file not shown.
Binary file added public/fonts/Inter-ExtraLight.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Light.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Medium.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Regular.ttf
Binary file not shown.
Binary file added public/fonts/Inter-SemiBold.ttf
Binary file not shown.
Binary file added public/fonts/Inter-Thin.ttf
Binary file not shown.
73 changes: 73 additions & 0 deletions public/fonts/InterFont.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
/* INTER * */
@font-face {
font-family: "Inter";
src: url("/fonts/Inter-Thin.ttf") format("truetype");
font-weight: 100;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-ExtraLight.ttf") format("truetype");
font-weight: 200;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-Light.ttf") format("truetype");
font-weight: 300;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-Regular.ttf") format("truetype");
font-weight: 400;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-Medium.ttf") format("truetype");
font-weight: 500;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-SemiBold.ttf") format("truetype");
font-weight: 600;
font-style: italic;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-Bold.ttf") format("truetype");
font-weight: 700;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-ExtraBold.ttf") format("truetype");
font-weight: 800;
font-style: normal;
font-display: swap;
}

@font-face {
font-family: "Inter";
src: url("/fonts/Inter-Black.ttf") format("truetype");
font-weight: 900;
font-style: normal;
font-display: swap;
}

Binary file added public/images/.DS_Store
Binary file not shown.
10 changes: 7 additions & 3 deletions public/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,15 @@
"footerReadMoreTerms": "Read more in Celo <0>Terms of Service</0>",
"footer": {
"emailIconAlt": "Envelop with Green Coin Sliding in",
"technology": "Technology",
"technology": "Tech",
"resources": "Resources",
"company": "Company",
"kits": "Kits",
"social": "Social",
"copyright": "The Celo Foundation, © Celo {{year}}",
"copyright": "© {{year}} Celo Inc.",
"Home": "Home",
"About": "About",
"Founders": "Founders",
"Join": "Careers",
"Validators": "Validators",
"Developers": "Developers",
Expand Down Expand Up @@ -78,5 +81,6 @@
"shortSuccess": "Submitted",
"applicationSubmitted": "Application Submitted",
"showAll": "Show All",
"collapse": "Collapse"
"collapse": "Collapse",
"footerEmailText": "World-changing ideas in your inbox"
}
53 changes: 32 additions & 21 deletions src/_page-tests/__snapshots__/_error.test.tsx.snap
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ exports[`Error renders 1`] = `
}

.emotion-2 {
font-family: EB Garamond,eb-garamond,Garamond,serif;
font-family: GT-Alpina,serif;
font-size: 48px;
line-height: 56;
text-rendering: geometricPrecision;
color: #111214;
font-weight: normal;
font-weight: 200;
margin: 0;
margin-block-start: 0;
margin-block-end: 0;
Expand All @@ -55,11 +55,11 @@ exports[`Error renders 1`] = `
}

.emotion-3 {
font-weight: normal;
font-weight: 200;
margin: 0;
margin-block-start: 0;
margin-block-end: 0;
font-family: EB Garamond,eb-garamond,Garamond,serif;
font-family: Inter,sans-serif;
font-size: 28px;
line-height: 36;
text-rendering: geometricPrecision;
Expand All @@ -70,6 +70,15 @@ exports[`Error renders 1`] = `
}

.emotion-4 {
box-sizing: border-box;
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
-webkit-flex-direction: column;
-ms-flex-direction: column;
flex-direction: column;
font-family: Inter,sans-serif;
-webkit-align-items: center;
-webkit-box-align: center;
-ms-flex-align: center;
Expand Down Expand Up @@ -97,41 +106,43 @@ exports[`Error renders 1`] = `
-webkit-box-align: center;
-ms-flex-align: center;
align-items: center;
font-family: Jost,futura-pt,futura,sans-serif;
font-family: Inter,sans-serif;
font-size: 16px;
line-height: 16;
text-align: center;
text-rendering: geometricPrecision;
color: #111214;
cursor: pointer;
font-weight: 500;
font-weight: 700;
line-height: 16px;
-webkit-text-decoration: none;
text-decoration: none;
min-width: 200px;
padding: 20px 30px;
font-size: 20px;
background-color: #35D07F;
border-color: #35D07F;
border-radius: 3px;
background-color: #FCFF52;
border: solid;
border-color: rgba(0, 0, 0, 0.2);
border-radius: 70px;
border-width: 1px;
font-weight: 500;
color: #FFFFFF;
padding: 24px 64px;
font-weight: 700;
color: #000;
}

.emotion-5:hover {
background-color: #4CDD91;
border-color: #4CDD91;
border-radius: 3px;
.emotion-5:hover,
.emotion-5:active {
background-color: #000;
border-color: rgba(0, 0, 0, 0.2);
border-radius: 70px;
border-width: 1px;
color: #FFFFFF;
}

.emotion-5:active {
background-color: #0FB972;
border-color: #0FB972;
outline-color: #0FB972;
border-radius: 3px;
border-width: 1px;
@media (max-width: 576px) {
.emotion-5 {
padding: 16px 24px;
}
}

<div>
Expand Down
Loading