diff --git a/public/index.html b/public/index.html
index 8c89ef6ddcec45a04eb2b87e38e7d2a502219dd0..5f3b2d6793d1a1064727d18e1e7695793f14c818 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,5 +1,5 @@
<!DOCTYPE html>
-<html lang="en">
+<html lang="en" style="margin: 0 auto">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
diff --git a/src/components/bottom-sheet/BottomSheet.module.css b/src/components/bottom-sheet/BottomSheet.module.css
index 23e0cf55d23f6884d9bdf294b84dd8648dbb4608..fd9dce3ff12ed1b2e4ac522779fa58b555f1362b 100644
--- a/src/components/bottom-sheet/BottomSheet.module.css
+++ b/src/components/bottom-sheet/BottomSheet.module.css
@@ -3,6 +3,7 @@
bottom: 0;
z-index: 10;
width: 100vw;
+ max-width: 768px;
height: 50vh;
border-top: 2px solid var(--brand-color);
background-color: white;
diff --git a/src/components/header/Header.module.css b/src/components/header/Header.module.css
index b238f7347c028bfba1aab2ad164618c3df22293e..bcbafa71185d3aace6180961fed13a0623c8097a 100644
--- a/src/components/header/Header.module.css
+++ b/src/components/header/Header.module.css
@@ -1,6 +1,7 @@
.container {
height: var(--header-height);
- width: 100%;
+ width: 100vw;
+ max-width: 768px;
padding: 15px;
font-weight: bold;
diff --git a/src/components/toast/Toast.module.css b/src/components/toast/Toast.module.css
index 6c620e1dabe76ba7ed96d529097a9e58008d6a0b..89a7a305880bb6f30ca232a8ebd7d98c5bd04cd9 100644
--- a/src/components/toast/Toast.module.css
+++ b/src/components/toast/Toast.module.css
@@ -3,6 +3,7 @@
top: 75px;
margin: 0 auto;
width: 80%;
+ max-width: calc(768px * 0.8);
left: 50%;
transform: translate(-50%, -50%);
z-index: 10;
diff --git a/src/index.css b/src/index.css
index d80802946c9038ef5b0b41b65b29618e5349c253..07f2b045a2d1524b7d0300b71d084ff49b32b518 100644
--- a/src/index.css
+++ b/src/index.css
@@ -11,11 +11,18 @@ body {
-moz-osx-font-smoothing: grayscale;
}
+#root {
+ max-width: 768px;
+}
+
html {
height: 100vh;
width: 100vw;
+ max-width: 768px;
+ margin: 0 auto;
}
+
a {
text-decoration: none;
color: black;
diff --git a/src/pages/cart-page/CartPage.module.css b/src/pages/cart-page/CartPage.module.css
index d38a72391a752bb55c05a1e11aac86b87061aeed..a25993205603580efa5f98d7183dc11eb49b837b 100644
--- a/src/pages/cart-page/CartPage.module.css
+++ b/src/pages/cart-page/CartPage.module.css
@@ -36,8 +36,9 @@
}
.item-remove {
- position: absolute;
+ position: relative;
right: 20px;
+ font-size: 36px;
float: right;
cursor: pointer;
}
@@ -50,11 +51,10 @@
}
.item-text {
- width: calc(100% - 88px);
-
display: flex;
flex-direction: column;
justify-content: space-between;
+ width: 100%;
}
.item-name {
@@ -71,10 +71,11 @@
.nav {
position: fixed;
bottom: 0;
- width: 100%;
height: 56px;
background-color: white;
padding: 8px;
+ max-width: calc(768px - 8px);
+ width: 100%;
}
.nav-btn {
diff --git a/src/pages/cart-page/CartPage.tsx b/src/pages/cart-page/CartPage.tsx
index fb5cfcd2bc18ca3c59589dd8b81929dcca7a2e0a..5e925b807c901417d85518030118ad5ad528a4cb 100644
--- a/src/pages/cart-page/CartPage.tsx
+++ b/src/pages/cart-page/CartPage.tsx
@@ -85,7 +85,6 @@ const CartPage: GFC = ({ connector }) => {
cartItem?.menus.map((d, i) => {
return (
<div className={S['item']} key={`item-${i}`}>
- <div onClick={() => handleRemoveItem(i)} className={S['item-remove']}>x</div>
<img className={S['item-image']} src={d.image}
alt={`item-${d.name}`}
/>
@@ -94,6 +93,7 @@ const CartPage: GFC = ({ connector }) => {
<span className={S['item-price']}>{moneyFormatter(d.price * quantities[i])}</span>
<QuantityController quantity={quantities[i]} setQuantity={setQuantities} index={i} />
</div>
+ <div onClick={() => handleRemoveItem(i)} className={S['item-remove']}>x</div>
</div>
);
})
diff --git a/src/pages/history-page/modules/order-box/OrderBox.module.css b/src/pages/history-page/modules/order-box/OrderBox.module.css
index 5678c4fdc6430bcb20a32306e93474fd7d2c67cc..9f721ec8469253488702a0e15fb9d4f4708ed516 100644
--- a/src/pages/history-page/modules/order-box/OrderBox.module.css
+++ b/src/pages/history-page/modules/order-box/OrderBox.module.css
@@ -24,12 +24,13 @@
}
.price {
- position: absolute;
+ position: relative;
float: right;
right: 16px;
+ bottom: 16px;
font-size: 20px;
}
.pickup {
display: block;
-}
\ No newline at end of file
+}
diff --git a/src/pages/login-page/LoginPage.module.css b/src/pages/login-page/LoginPage.module.css
index e607ceb8a34c7ddc0132ef7d5d5b35812ea57c27..632667cb9129166deb19ba4129ee2b243713a077 100644
--- a/src/pages/login-page/LoginPage.module.css
+++ b/src/pages/login-page/LoginPage.module.css
@@ -1,5 +1,6 @@
.container {
width: 100vw;
+ max-width: 768px;
height: 100vh;
margin-top: calc(-1*var(--header-height));
diff --git a/src/pages/menu-page/modules/menu-box/MenuBox.module.css b/src/pages/menu-page/modules/menu-box/MenuBox.module.css
index e61de3c7819d26636cfd98f96bca7bc38346d5d4..f0a858fc77d3f2cdc8953434350ba69b3104be13 100644
--- a/src/pages/menu-page/modules/menu-box/MenuBox.module.css
+++ b/src/pages/menu-page/modules/menu-box/MenuBox.module.css
@@ -59,6 +59,7 @@
bottom: 0;
padding-bottom: 24px;
width: calc(100% - 48px);
+ max-width: calc(768px - 48px);
}
.bs-bottom button {
diff --git a/src/pages/order-page/module/ExitButton.module.css b/src/pages/order-page/module/ExitButton.module.css
index 798dac9f6a609bd629b4bc77a30153d55809ad5c..399bc46c5108bef107b4d7889392b24a5ca70746 100644
--- a/src/pages/order-page/module/ExitButton.module.css
+++ b/src/pages/order-page/module/ExitButton.module.css
@@ -1,5 +1,6 @@
.container {
width: 100vw;
+ max-width: 768px;
height: 100vh;
margin-top: calc(-1*var(--header-height));
diff --git a/src/pages/signup-page/SignupPage.module.css b/src/pages/signup-page/SignupPage.module.css
index 1223b484757d511b32f2226a7afc30d9681679f4..1958a7b524e0023b500ba5c2c28aa35850279a8e 100644
--- a/src/pages/signup-page/SignupPage.module.css
+++ b/src/pages/signup-page/SignupPage.module.css
@@ -1,5 +1,6 @@
.container {
width: 100vw;
+ max-width: 768px;
height: 100vh;
margin-top: -48px;
@@ -42,4 +43,4 @@
}
.password-unsame {
color: red;
-}
\ No newline at end of file
+}