Merge branch 'develop' into page-profile-ui

Kernel360 · Jan 18, 2024 · e3b50cf · e3b50cf
2 parents eb78129 + 79c616b
commit e3b50cf
Show file tree

Hide file tree

Showing 50 changed files with 523 additions and 164 deletions.
diff --git a/public/assets/icons/channel.svg b/public/assets/icons/channel.svg
diff --git a/public/assets/icons/expand.svg b/public/assets/icons/expand.svg
diff --git a/public/assets/icons/favorite.svg b/public/assets/icons/favorite.svg
diff --git a/public/assets/icons/filledFavorite.svg b/public/assets/icons/filledFavorite.svg
diff --git a/public/assets/icons/filledHeart.svg b/public/assets/icons/filledHeart.svg
diff --git a/public/assets/icons/filledHome.svg b/public/assets/icons/filledHome.svg
diff --git a/public/assets/icons/heart.svg b/public/assets/icons/heart.svg
diff --git a/public/assets/icons/home.svg b/public/assets/icons/home.svg
diff --git a/public/assets/icons/location.svg b/public/assets/icons/location.svg
diff --git a/public/assets/icons/map.svg b/public/assets/icons/map.svg
diff --git a/public/assets/icons/profile.svg b/public/assets/icons/profile.svg
diff --git a/public/assets/icons/search.svg b/public/assets/icons/search.svg
diff --git a/public/assets/loading.png b/public/assets/loading.png
diff --git a/src/app/globals.css b/src/app/globals.css
@@ -8,7 +8,10 @@
   --gray-300: #72777A;
   --gray-400: #404446;
   --tertiary: #7A7A7A;
+  --tertiary-100: #EAEAEA;
+  --tertiary-200: #F6F6F6;
   --tertiary-300: #F5F5F5;
+  --tertiary-400: #7C7A7A;
   --black: #090A0A;
   --white: #FFF;
   --white-100: #F3F5F8;