fix: SCSS update conflict

mozilla · Jan 9, 2025 · 1245bd4 · 1245bd4
1 parent fecb559
commit 1245bd4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss b/src/app/(proper_react)/(redesign)/(public)/LandingView.module.scss
@@ -10,16 +10,16 @@
   display: flex;
   flex-direction: column;
   align-items: center;
-  gap: $spacing-lg;
-  padding: $layout-md $spacing-md;
+  gap: tokens.$spacing-lg;
+  padding: tokens.$layout-md tokens.$spacing-md;
 
   .waitlistTitle {
     text-align: center;
-    font: $text-title-2xs;
+    font: tokens.$text-title-2xs;
     font-weight: 600;
     line-height: 1.4;
     font-family: var(--font-inter);
-    color: $color-purple-70;
+    color: tokens.$color-purple-70;
   }
 
   a {

diff --git a/src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss b/src/app/(proper_react)/(redesign)/(public)/PublicShell.module.scss
@@ -26,7 +26,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: tokens.$spacing-lg $token.layout-xl;
+  padding: tokens.$spacing-lg tokens.$layout-xl;
   background-color: tokens.$color-white;
   gap: tokens.$spacing-lg;
 
@@ -49,19 +49,19 @@
       display: flex;
 
       a {
-        color: token.$color-black;
+        color: tokens.$color-black;
         text-decoration: none;
         font-weight: 600;
-        padding: token.$spacing-sm $spacing-md;
+        padding: tokens.$spacing-sm tokens.$spacing-md;
 
         &:hover {
-          background-color: token.$color-purple-70;
+          background-color: tokens.$color-purple-70;
           text-decoration: underline;
         }
       }
     }
 
-    @media screen and (max-width: token.$screen-xl) {
+    @media screen and (max-width: tokens.$screen-xl) {
       display: none;
     }
   }

diff --git a/src/app/(proper_react)/(redesign)/MobileShell.module.scss b/src/app/(proper_react)/(redesign)/MobileShell.module.scss
@@ -96,7 +96,7 @@
         flex-direction: column;
 
         ul {
-          border-bottom: 1px solid $color-grey-10;
+          border-bottom: 1px solid tokens.$color-grey-10;
           list-style-type: none;
           padding: 0;
           width: 100%;