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

71 typography update #83

Merged
merged 10 commits into from
Oct 31, 2023
Merged

71 typography update #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
01fa475
fix typography and colors
Oct 25, 2023
42b19ce
some common fixes
Oct 26, 2023
7d657e5
fix blog page navigation
Oct 26, 2023
89bedc1
delete comments
Oct 27, 2023
27676f3
Merge pull request #1 from TowerOneka/73-create-card-component
RuumArt Oct 27, 2023
dfc02bd
Merge branch 'master' into 71-typography-update
RuumArt Oct 27, 2023
c2d0265
formatter fixes
Oct 30, 2023
05b5776
Merge branch 'master' into 71-typography-update
Oct 30, 2023
82f74a3
Merge branch 'master' into 71-typography-update
ukorvl Oct 30, 2023
f032e6c
fix paragraph full cycle and formatting from master
Oct 31, 2023
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
10 changes: 5 additions & 5 deletions site/src/components/common/AnimatedDottedContainer/AnimatedDottedContainer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
flex-direction: column;
width: 100%;
height: 100%;
background-color: $black;
background-color: $gray900;
will-change: transform;
}

Expand All @@ -35,7 +35,7 @@
bottom: size(30);
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand All @@ -49,7 +49,7 @@
bottom: size(30);
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand All @@ -67,7 +67,7 @@
top: size(30);
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;
}

&:after {
Expand All @@ -77,7 +77,7 @@
top: size(30);
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;
}

.line {
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/common/ArrowButton/ArrowButton.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
left: 0;
height: 2px;
width: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/common/BenefitsCard/BenefitsCard.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.title {
margin-bottom: size(16);

@include heading-02;
@include heading-03;

@include mobile {
margin-bottom: size(25);
Expand Down
16 changes: 13 additions & 3 deletions site/src/components/common/Footer/Footer.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@use '~styles/mixins' as *;

.root {
color: $white;
color: $gray-50;

@include sm-paragraph;
}
Expand Down Expand Up @@ -54,6 +54,10 @@
margin-bottom: size(8);
transition: opacity 0.3s ease;

@include button-small;

color: $buttonGray50;

@include hover {
opacity: 0.5;
cursor: pointer;
Expand All @@ -69,7 +73,7 @@

.title {
margin-bottom: size(15);
color: $grey;
color: $secondary;
}

.socials {
Expand Down Expand Up @@ -108,7 +112,7 @@
.place {
width: size(233);

@include paragraph;
@include main;

@include mobile {
width: 100%;
Expand All @@ -131,6 +135,8 @@
.copyright {
grid-column: span 3;

letter-spacing: size(-0.1);

@include mobile {
margin-bottom: size(15);
}
Expand All @@ -139,6 +145,10 @@
.creators {
transition: opacity 0.3s ease;

@include button-small;

color: $buttonGray50;

@include hover {
opacity: 0.5;
}
Expand Down
6 changes: 3 additions & 3 deletions site/src/components/common/Header/BurgerMenu/BurgerMenu.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
height: get-real-vh(100);
width: 100%;
z-index: -1;
background-color: $black;
background-color: $gray900;
justify-content: space-between;
transform: translateY(calc(-150% - size(30)));
transition: transform 1s ease;
Expand Down Expand Up @@ -83,7 +83,7 @@

.right {
padding: 0 size(53) size(20) size(30);
background-color: $black;
background-color: $gray900;
}

.link {
Expand All @@ -105,7 +105,7 @@
.box3 {
width: 30%;
height: 45%;
background: $black;
background: $gray900;
display: flex;
align-items: flex-end;
}
Expand Down
14 changes: 7 additions & 7 deletions site/src/components/common/Header/Header.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
display: grid;
grid-template-columns: size(262) repeat(2, size(270)) 1fr;
padding: size(6) size(12);
background-color: $white;
background-color: $gray-50;

@include mobile {
grid-template-columns: repeat(2, 1fr);
Expand All @@ -29,7 +29,7 @@

.logo {
width: size(141.7);
color: $black;
color: $gray900;

@include mobile {
width: size(150);
Expand Down Expand Up @@ -67,11 +67,11 @@
}

@include hover {
color: $black;
color: $gray900;
transition: color 0.3s ease;

.square {
background-color: $black;
background-color: $gray900;
transition: background-color 0.3s ease;
}
}
Expand All @@ -81,16 +81,16 @@
transition: color 0.3s ease;

@include hover {
color: $black;
color: $gray900;
transition: color 0.3s ease;
}
}

.isActive {
color: $black;
color: $gray900;

.square {
background-color: $black;
background-color: $gray900;
}
}

Expand Down
10 changes: 5 additions & 5 deletions site/src/components/common/HeadingSection/HeadingSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,31 @@
width: 100%;
min-height: size(420);
padding: size(30);
background-color: $black;
background-color: $gray900;
word-break: break-word;

&:before {
&:before {
content: '';
position: absolute;
top: 0px;
left: -1px;
width: 4px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
}
}

&:after {
&:after {
content: '';
position: absolute;
top: 0px;
right: -1px;
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand Down
10 changes: 6 additions & 4 deletions site/src/components/common/IntroAnimation/IntroAnimation.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
grid-template-columns: size(272) 1fr;
width: 100%;
min-height: calc(100vh - #{size(30)});
background-color: $black;
background-color: $gray900;

@include mobile {
grid-template-columns: 100%;
Expand All @@ -21,15 +21,14 @@
position: relative;
grid-area: 2 / 2;


&:before {
content: '';
position: absolute;
top: 0px;
right: -1px;
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand All @@ -43,7 +42,7 @@
left: -1px;
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand Down Expand Up @@ -71,11 +70,14 @@

.description {
@include paragraph;
line-height: size(21);
width: 100%;
z-index: 2;

@include mobile {
max-width: 100%;
// @include sm-paragraph;
line-height: size(20);
}
}

Expand Down
2 changes: 1 addition & 1 deletion site/src/components/common/IntroAnimation/IntroAnimation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function IntroAnimation({
})

navigationTimeline.to(sideNavigation, {
scale: '0.52',
scale: '1',
ease: 'expo.out',
})

Expand Down
8 changes: 4 additions & 4 deletions site/src/components/common/JoinSection/JoinSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
width: size(544);
padding-bottom: size(30);
margin-bottom: -1px;
background-color: $black;
background-color: $gray900;

@include mobile {
width: 100%;
Expand All @@ -51,17 +51,17 @@
.contentWrapper {
position: relative;
width: size(272);
background-color: $black;
background-color: $gray900;
margin-bottom: -1px;

&:after {
&:after {
content: '';
position: absolute;
top: 0px;
right: -1px;
width: 2px;
height: 100%;
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/common/LastSection/LastSection.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
}

.box {
background-color: $black;
background-color: $gray900;
}

.box1 {
Expand Down
2 changes: 1 addition & 1 deletion site/src/components/common/ListItem/ListItem.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
height: size(8);
margin: size(4) size(20) 0 0;
content: '';
background-color: $white;
background-color: $gray-50;

@include mobile {
margin: size(4) size(10) 0 0;
Expand Down
12 changes: 5 additions & 7 deletions site/src/components/common/SideNavigation/SideNavigation.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
position: relative;
left: unset;
top: unset;
width: 100%;
height: 100%;
width: size(158);
}
}

Expand All @@ -44,7 +44,7 @@
}

.title {
@include heading-02;
@include heading-03;
text-align: left;

@include mobile {
Expand All @@ -53,19 +53,17 @@
}

.titleLarge {
font-size: size(64);
line-height: 90%;

@include heading-01;
@include mobile {
font-size: size(45);
@include heading-04;
width: 100%;
}
}

.linkWrapper {
width: size(272);
margin-bottom: size(30);
background-color: $black;
background-color: $gray900;

@include mobile {
display: none;
Expand Down
Loading