Skip to content

Commit 1245bd4

Browse files
committed
fix: SCSS update conflict
1 parent fecb559 commit 1245bd4

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
display: flex;
1111
flex-direction: column;
1212
align-items: center;
13-
gap: $spacing-lg;
14-
padding: $layout-md $spacing-md;
13+
gap: tokens.$spacing-lg;
14+
padding: tokens.$layout-md tokens.$spacing-md;
1515

1616
.waitlistTitle {
1717
text-align: center;
18-
font: $text-title-2xs;
18+
font: tokens.$text-title-2xs;
1919
font-weight: 600;
2020
line-height: 1.4;
2121
font-family: var(--font-inter);
22-
color: $color-purple-70;
22+
color: tokens.$color-purple-70;
2323
}
2424

2525
a {

src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
display: flex;
2727
align-items: center;
2828
justify-content: space-between;
29-
padding: tokens.$spacing-lg $token.layout-xl;
29+
padding: tokens.$spacing-lg tokens.$layout-xl;
3030
background-color: tokens.$color-white;
3131
gap: tokens.$spacing-lg;
3232

@@ -49,19 +49,19 @@
4949
display: flex;
5050

5151
a {
52-
color: token.$color-black;
52+
color: tokens.$color-black;
5353
text-decoration: none;
5454
font-weight: 600;
55-
padding: token.$spacing-sm $spacing-md;
55+
padding: tokens.$spacing-sm tokens.$spacing-md;
5656

5757
&:hover {
58-
background-color: token.$color-purple-70;
58+
background-color: tokens.$color-purple-70;
5959
text-decoration: underline;
6060
}
6161
}
6262
}
6363

64-
@media screen and (max-width: token.$screen-xl) {
64+
@media screen and (max-width: tokens.$screen-xl) {
6565
display: none;
6666
}
6767
}

src/app/(proper_react)/(redesign)/MobileShell.module.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
flex-direction: column;
9797

9898
ul {
99-
border-bottom: 1px solid $color-grey-10;
99+
border-bottom: 1px solid tokens.$color-grey-10;
100100
list-style-type: none;
101101
padding: 0;
102102
width: 100%;

0 commit comments

Comments
 (0)