Skip to content

Commit

Permalink
Merge pull request #76 from Kernel360/ui-main-page
Browse files Browse the repository at this point in the history
페이지 UI: 메인 페이지
  • Loading branch information
bottlewook authored Jan 16, 2024
2 parents c1b7bbc + 925668f commit 2ebc097
Show file tree
Hide file tree
Showing 26 changed files with 418 additions and 331 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"react-dom": "^18",
"react-hook-form": "^7.49.2",
"react-redux": "^9.0.4",
"swiper": "^10"
"swiper": "^11"
},
"devDependencies": {
"@storybook/addon-essentials": "^7.6.6",
Expand Down Expand Up @@ -75,4 +75,4 @@
"msw": {
"workerDirectory": "public"
}
}
}
Binary file modified public/assets/banner.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/recommandItem1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/recommandItem2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/recommandItem3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/recommandItem4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/app/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
--pink: #F67272;

/* -------------- z-index -------------- */
--header-zindex: 2;
--dimmed-zindex: 10;
--modal-zindex: 11;
}
Expand Down
229 changes: 0 additions & 229 deletions src/app/page.module.css

This file was deleted.

32 changes: 32 additions & 0 deletions src/app/page.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.headerWrapper {
padding: 0 24px;

.header {
z-index: 999;
}
}

.mainContainer {
.searchBarWrapper {
padding: 0 24px;
}

.bannerWrapper {
max-height: 140px;
overflow-y: hidden;
}

.recommandTextWrapper {
padding: 0 24px;
}

.productListContainer {
padding: 0 24px 80px;

.productArticleContainer {
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 12px;
}
}
}
Loading

0 comments on commit 2ebc097

Please sign in to comment.