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

Jump to bottom

Release 2024-04-18 #3137

Merged
merged 4 commits into from
Apr 18, 2024
Merged

Release 2024-04-18 #3137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5868c15
fix: add Explore wallets button for signed out users and modify hero …
Apr 18, 2024
262748d
chore: clean up console logs and unused styles
Apr 18, 2024
4fca856
chore: run linter
Apr 18, 2024
f9c7f5a
Merge pull request #3136 from near/jh/minor-ui-3125
jackson-harris-iii Apr 18, 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
200 changes: 98 additions & 102 deletions packages/frontend/src/components/common/FormButton.js
View file
Open in desktop

Large diffs are not rendered by default.

609 changes: 591 additions & 18 deletions packages/frontend/src/components/landing/GuestLanding.js
View file
Open in desktop

Large diffs are not rendered by default.

209 changes: 106 additions & 103 deletions packages/frontend/src/components/landing/GuestLanding.styles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@ import styled from 'styled-components';
import PlusIcon from '../../images/plus-icon.png';

export const StyledContainer = styled.div`

background-image: url(${PlusIcon});
background-size: 75px 75px;
&&& {
margin: 35px auto 100px auto;
max-width: 1224px;
position: relative;
margin: 32px auto 32px auto;

max-width: 100%;
display: flex;
align-items: center;

@media (max-width: 1352px) {
padding: 0 64px;
padding: 0 24px;
}

@media (max-width: 991px) {
Expand All @@ -23,6 +26,10 @@ export const StyledContainer = styled.div`
margin-top: -13px;
}

@media (max-width: 900px) {
min-height: 390px;
}

svg {
opacity: 0.4;
position: absolute;
Expand Down Expand Up @@ -57,17 +64,17 @@ export const StyledContainer = styled.div`
margin: 0;
letter-spacing: -1.08px;
line-height: 100%;
@media(max-width: 768px) {
@media (max-width: 768px) {
font-size: 60px;
}
}

h2 {
@media(max-width: 768px) {
@media (max-width: 768px) {
font-size: 45px;
}
@media(max-width: 576px) {

@media (max-width: 576px) {
font-size: 40px;
}
}
Expand Down Expand Up @@ -166,9 +173,9 @@ export const StyledContainer = styled.div`
export const Section = styled.div`
width: 100%;
position: relative;
background-color: #F2F1EA;
background-color: #f2f1ea;
padding: 100px 0 60px 0;
@media(max-width: 768px) {
@media (max-width: 768px) {
padding: 50px 30px;
}
h2 {
Expand All @@ -178,14 +185,14 @@ export const Section = styled.div`
font-weight: 500;
line-height: 130%;
padding-bottom: 42px;
@media(max-width: 576px) {
@media (max-width: 576px) {
font-size: 40px;
}
}
h3 {
color: #000000;
padding-bottom: 120px;
@media(max-width: 768px) {
@media (max-width: 768px) {
padding-bottom: 50px;
font-size: 20px;
}
Expand All @@ -197,30 +204,26 @@ export const Section = styled.div`
`;

export const MainContainer = styled.div`
background-image: url(${PlusIcon});
background-size: 100px 95px;
min-height: 680px;
min-height: 500px;
display: flex;
width: 100%;
-webkit-box-align: center;
align-items: center;
background-repeat: repeat;
background-position: center top;
@media(max-width: 768px) {
margin-bottom: 20px;
}
margin: 72px auto 72px auto;
`;

export const MainSection = styled.div`
padding: 1rem;
max-width: 675px;
margin: 0 auto;
background-color: #FFFFFF;
background-color: #ffffff;
display: flex;
-webkit-box-align: center;
align-items: center;
min-height: 260px;
@media(max-width: 768px) {
@media (max-width: 768px) {
flex-wrap: wrap;
}
`;
Expand All @@ -247,52 +250,52 @@ export const DefaultContainer = styled.div`
`;

export const FlexBox = styled.div`
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 120px;
@media(max-width: 768px) {
flex-wrap: wrap;
row-gap: 50px;
padding-bottom: 50px;
}
display: flex;
justify-content: space-between;
align-items: center;
padding-bottom: 120px;
@media (max-width: 768px) {
flex-wrap: wrap;
row-gap: 50px;
padding-bottom: 50px;
}
`;

export const FlexItem = styled.div`
width: 100%;
h4 {
margin: 0;
font-size: 24px;
font-style: normal;
font-weight: 600;
line-height: 150%;
padding-bottom: 32px;
}
p {
margin: 0;
font-size: 16px;
font-style: normal;
font-weight: 450;
line-height: 150%;
letter-spacing: 0.32px;
color: #000000;
max-width: ${(props) => props.accountFound ? '430px' : '100%'};
padding-bottom: 48px;
@media(max-width: 768px) {
max-width: 100%;
}
}
h4 {
margin: 0;
font-size: 24px;
font-style: normal;
font-weight: 600;
line-height: 150%;
padding-bottom: 32px;
}
p {
margin: 0;
font-size: 16px;
font-style: normal;
font-weight: 450;
line-height: 150%;
letter-spacing: 0.32px;
color: #000000;
max-width: ${(props) => (props.accountFound ? '430px' : '100%')};
padding-bottom: 48px;
@media (max-width: 768px) {
max-width: 100%;
}
}
`;

export const InfoSection = styled.div`
display: flex;
align-items: end;
justify-content: space-between;
padding-bottom: 60px;
@media(max-width: 768px) {
flex-wrap: wrap;
row-gap: 50px;
}
display: flex;
align-items: end;
justify-content: space-between;
padding-bottom: 60px;
@media (max-width: 768px) {
flex-wrap: wrap;
row-gap: 50px;
}
`;

export const SecondaryTitle = styled.h4`
Expand All @@ -318,11 +321,11 @@ export const FormButtonContainer = styled.div`
text-align: right;
min-width: 500px;

@media(max-width: 1352px) {
@media (max-width: 1352px) {
min-width: 300px;
}

@media(max-width: 768px) {
@media (max-width: 768px) {
min-width: 100%;
}
`;
Expand All @@ -335,39 +338,39 @@ export const CardsSection = styled.div`
export const CardContainer = styled.div`
display: grid;
grid-template-columns: repeat(3, 1fr);
grid-auto-rows: minmax(100px, auto);
gap: 24px;
grid-auto-rows: minmax(100px, auto);
gap: 24px;
min-width: 300px;
@media (max-width: 600px) {
grid-template-columns: 1fr;
}
`;

export const SingleCard = styled.a`
border: 1px solid #1B1B18;
transition: all .4s;
border-radius: 8px;
padding: 32px;
cursor: pointer;
outline: none;
&:hover {
background-color: #E3E3E0;
border: 1px solid #1b1b18;
transition: all 0.4s;
border-radius: 8px;
padding: 32px;
cursor: pointer;
outline: none;
&:hover {
background-color: #e3e3e0;
text-decoration: none;
}
}
img {
width: 52px;
padding-bottom: 32px;
}
h3 {
margin: 0;
padding: 0;
font-size: 20px;
font-style: normal;
font-weight: 500;
line-height: 130%;
letter-spacing: 0.3px;
padding-bottom: 24px;
}
h3 {
margin: 0;
padding: 0;
font-size: 20px;
font-style: normal;
font-weight: 500;
line-height: 130%;
letter-spacing: 0.3px;
padding-bottom: 24px;
}
p {
margin: 0;
padding: 0;
Expand All @@ -381,9 +384,9 @@ export const SingleCard = styled.a`
`;
export const TransferSection = styled.div`
background-color: #000000;
color: #FFFFFF;
color: #ffffff;
padding: 80px 0;
@media(max-width: 768px) {
@media (max-width: 768px) {
padding: 50px 30px;
}
`;
Expand All @@ -392,31 +395,31 @@ export const TransferSectionWrapper = styled.div`
display: flex;
justify-content: space-between;
align-items: end;
@media(max-width: 768px) {
@media (max-width: 768px) {
flex-wrap: wrap;
row-gap: 50px;
}
h4 {
margin: 0;
font-size: 24px;
font-style: normal;
font-weight: 500;
line-height: 130%;
padding-bottom: 32px;
color: #FFFFFF;
margin: 0;
font-size: 24px;
font-style: normal;
font-weight: 500;
line-height: 130%;
padding-bottom: 32px;
color: #ffffff;
}
p {
margin: 0;
font-size: 16px;
font-style: normal;
font-weight: 450;
line-height: 150%;
letter-spacing: 0.32px;
margin: 0;
font-size: 16px;
font-style: normal;
font-weight: 450;
line-height: 150%;
letter-spacing: 0.32px;
}
`;

export const MainSectionButtons = styled.div`
display: flex;
justify-content: space-between;
gap: 24px;
display: flex;
justify-content: space-between;
gap: 24px;
`;
3 changes: 2 additions & 1 deletion packages/frontend/src/translations/en.global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
"enable": "Enable",
"enabling": "Enabling",
"exploreNEAR": "Explore NEAR",
"exploreWallets": "Explore Wallets",
"findMyAccount": "Find My Account",
"finish": "Finish",
"fundWith": "Fund with",
Expand Down Expand Up @@ -2027,4 +2028,4 @@
"title": "Your account is now active!"
}
}
}
}
1 change: 1 addition & 0 deletions packages/frontend/src/translations/it.global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@
"enable": "Abilita",
"enabling": "Abilitando",
"exploreNEAR": "Esplora NEAR",
"exploreWallets": "Esplora Wallets",
"findMyAccount": "Trova il mio Account",
"finish": "Completo",
"fundWith": "Deposita con",
Expand Down
5 changes: 3 additions & 2 deletions packages/frontend/src/translations/kr.global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,7 @@
"enable": "활성화",
"enabling": "활성화 중",
"exploreNEAR": "NEAR 탐색",
"exploreWallets": "Wallets 탐색",
"findMyAccount": "계정 찾기",
"finish": "완료",
"fundWith": "Fund with",
Expand Down Expand Up @@ -1901,7 +1902,7 @@
"removeDesc": "이메일과 SMS 복구 방법, 이전 복구 구문, NEAR CLI에서 생성된 Full 액세스 키",
"removeKeys": "키 제거",
"title": "Full 액세스 키 비워내기",
"verifyPassphrase": {
"verifyPassphrase": {
"desc": "복구 구문을 입력하여 다음 계정의 Full 액세스 키를 삭제하십시오: <b>${accountId}</b>",
"keyMessages": {
"doesNotExist": "입력된 시드 문구에 부합하는 ${accountId}의 Full 액세스 키가 존재하지 않습니다.",
Expand Down Expand Up @@ -1983,4 +1984,4 @@
"title": "이제 계정이 활성화되었습니다!"
}
}
}
}
Loading
Loading