Merge pull request #145 from readyvery/test

배포 전 마지막
readyvery · Dec 3, 2023 · 7d37b76 · 7d37b76
2 parents 7a495a3 + fbcdd1a
commit 7d37b76
Show file tree

Hide file tree

Showing 56 changed files with 127 additions and 112 deletions.
diff --git a/public/images/cafe_dream/bakery_bagel.svg b/public/images/cafe_dream/bakery_bagel.svg
diff --git a/public/images/cafe_dream/bakery_bagelchip.svg b/public/images/cafe_dream/bakery_bagelchip.svg
diff --git a/public/images/cafe_dream/bakery_croquemuisene.svg b/public/images/cafe_dream/bakery_croquemuisene.svg
diff --git a/public/images/cafe_dream/bakery_hotdog.svg b/public/images/cafe_dream/bakery_hotdog.svg
diff --git a/public/images/cafe_dream/bakery_macaron.svg b/public/images/cafe_dream/bakery_macaron.svg
diff --git a/public/images/cafe_dream/bakery_muffin.svg b/public/images/cafe_dream/bakery_muffin.svg
diff --git a/public/images/cafe_dream/home.svg b/public/images/cafe_dream/home.svg
diff --git a/public/images/cafe_dream/setmenu_hotdog.svg b/public/images/cafe_dream/setmenu_hotdog.svg
diff --git a/public/images/harang/coffee_americano.svg b/public/images/harang/coffee_americano.svg
diff --git a/public/images/harang/coffee_latte.svg b/public/images/harang/coffee_latte.svg
diff --git a/public/images/harang/hotdog.svg b/public/images/harang/hotdog.svg
diff --git a/public/images/harang/icecream.svg b/public/images/harang/icecream.svg
diff --git a/public/images/harang/latte_choco.svg b/public/images/harang/latte_choco.svg
diff --git a/public/images/harang/latte_coffee_milktea.svg b/public/images/harang/latte_coffee_milktea.svg
diff --git a/public/images/harang/latte_mintchoco.svg b/public/images/harang/latte_mintchoco.svg
diff --git a/public/images/harang/smoothie_blueberry.svg b/public/images/harang/smoothie_blueberry.svg
diff --git a/public/images/harang/smoothie_choco.svg b/public/images/harang/smoothie_choco.svg
diff --git a/public/images/harang/smoothie_greentea.svg b/public/images/harang/smoothie_greentea.svg
diff --git a/public/images/harang/smoothie_kiwi.svg b/public/images/harang/smoothie_kiwi.svg
diff --git a/public/images/harang/smoothie_mintchoco.svg b/public/images/harang/smoothie_mintchoco.svg
diff --git a/public/images/harang/smoothie_oreo.svg b/public/images/harang/smoothie_oreo.svg
diff --git a/public/images/orda/bakery_carrotcake.svg b/public/images/orda/bakery_carrotcake.svg
diff --git a/public/images/orda/bakery_cheesecake.svg b/public/images/orda/bakery_cheesecake.svg
diff --git a/public/images/orda/bakery_croquemuisen.svg b/public/images/orda/bakery_croquemuisen.svg
diff --git a/public/images/orda/bakery_honeybutterbread.svg b/public/images/orda/bakery_honeybutterbread.svg
diff --git a/public/images/orda/bakery_icecreamcroffle.svg b/public/images/orda/bakery_icecreamcroffle.svg
diff --git a/public/images/orda/bakery_macaron_choco.svg b/public/images/orda/bakery_macaron_choco.svg
diff --git a/public/images/orda/bakery_macaron_chocovanila.svg b/public/images/orda/bakery_macaron_chocovanila.svg
diff --git a/public/images/orda/bakery_macaron_creambrille.svg b/public/images/orda/bakery_macaron_creambrille.svg
diff --git a/public/images/orda/bakery_macaron_greenchoco.svg b/public/images/orda/bakery_macaron_greenchoco.svg
diff --git a/public/images/orda/bakery_macaron_mintchoco.svg b/public/images/orda/bakery_macaron_mintchoco.svg
diff --git a/public/images/orda/bakery_macaron_yellowcheese.svg b/public/images/orda/bakery_macaron_yellowcheese.svg
diff --git a/public/images/orda/bakery_plaincroffle.svg b/public/images/orda/bakery_plaincroffle.svg
diff --git a/public/images/orda/bakery_tiramisu.svg b/public/images/orda/bakery_tiramisu.svg
diff --git a/public/images/orda/coffee_americano.svg b/public/images/orda/coffee_americano.svg
diff --git a/public/images/orda/coffee_latte.svg b/public/images/orda/coffee_latte.svg
diff --git a/public/images/orda/icecream.svg b/public/images/orda/icecream.svg
diff --git a/public/images/orda/latte_choco.svg b/public/images/orda/latte_choco.svg
diff --git a/public/images/orda/latte_coffee_milktea.svg b/public/images/orda/latte_coffee_milktea.svg
diff --git a/public/images/orda/latte_mintchoco.svg b/public/images/orda/latte_mintchoco.svg
diff --git a/public/images/orda/sanpellegrino.svg b/public/images/orda/sanpellegrino.svg
diff --git a/public/images/orda/smoothie_blueberry.svg b/public/images/orda/smoothie_blueberry.svg
diff --git a/public/images/orda/smoothie_choco.svg b/public/images/orda/smoothie_choco.svg
diff --git a/public/images/orda/smoothie_greentea.svg b/public/images/orda/smoothie_greentea.svg
diff --git a/public/images/orda/smoothie_kiwi.svg b/public/images/orda/smoothie_kiwi.svg
diff --git a/public/images/orda/smoothie_mintchoco.svg b/public/images/orda/smoothie_mintchoco.svg
diff --git a/public/images/orda/smoothie_oreo.svg b/public/images/orda/smoothie_oreo.svg
diff --git a/public/images/orda/sparkling.svg b/public/images/orda/sparkling.svg
diff --git a/src/pages/CafeSearch/CafeSearch.css b/src/pages/CafeSearch/CafeSearch.css
@@ -1,6 +1,5 @@
 .search-container {
   width: 100%;
-  height: 94vh;
 }
 
 .search-list {

diff --git a/src/pages/CartPage/CartPage.css b/src/pages/CartPage/CartPage.css
@@ -135,7 +135,7 @@
   justify-content: center;
   gap: 0.36925rem;
   color: #4f4f4f;
-  font-family: "Semibold";
+  font-family: "SemiBold";
   font-size: 0.9375rem;
   line-height: 130%; /* 1.21875rem */
   letter-spacing: -0.00938rem;

diff --git a/src/pages/MyPage/CouponPage/CouponPage.css b/src/pages/MyPage/CouponPage/CouponPage.css
@@ -1,7 +1,6 @@
 .coupon-div {
   width: 100%;
   margin: 0 auto;
-  height: 94vh;
 }
 
 .coupon-list {

diff --git a/src/pages/OrderProcessPage/OrderProcess.css b/src/pages/OrderProcessPage/OrderProcess.css
@@ -1,7 +1,6 @@
 .order-process-page {
   display: flex;
   width: 100%;
-  height: 94vh;
   flex-direction: column;
   padding-bottom: 2rem;
 }
@@ -287,7 +286,7 @@
   display: flex;
   color: #000;
   text-align: right;
-  font-family: "Semibold";
+  font-family: "SemiBold";
   font-size: 1.125rem;
   line-height: 130%; /* 1.4625rem */
   letter-spacing: 0.0225rem;

diff --git a/src/pages/PackagingStatusPage/PackagingStatusPage.css b/src/pages/PackagingStatusPage/PackagingStatusPage.css
@@ -15,7 +15,7 @@
   display: flex;
   color: #4f4f4f;
   text-align: center;
-  font-family: "Semibold";
+  font-family: "SemiBold";
   font-size: 0.9375rem;
   line-height: 130%; /* 1.21875rem */
   letter-spacing: -0.00938rem;
@@ -61,7 +61,7 @@
 .packaging-status-page__text {
   color: #000;
   text-align: center;
-  font-family: "Semibold";
+  font-family: "SemiBold";
   font-size: 0.9375rem;
   line-height: 130%; /* 1.21875rem */
   letter-spacing: -0.00938rem;
@@ -71,7 +71,7 @@
 
 .packaging-status-page__event {
   color: var(--kakao-logo, #d82356);
-  font-family: "Semibold";
+  font-family: "SemiBold";
   font-size: 0.9375rem;
   line-height: 130%;
   letter-spacing: -0.00938rem;

diff --git a/src/pages/PaymentPage/PaymentPage.css b/src/pages/PaymentPage/PaymentPage.css
@@ -142,7 +142,7 @@
   align-items: center;
   color: #000;
   text-align: center;
-  font-family: "Semibold";
+  font-family: "SemiBold";
   font-size: 0.9375rem;
   font-style: normal;
   font-weight: 600;

diff --git a/src/pages/StoreDetailPage/StoreDetailPage.css b/src/pages/StoreDetailPage/StoreDetailPage.css
@@ -162,10 +162,19 @@
 
 .store-detail-page__menuList__item__name {
   color: #000;
-  font-family: "Semibold";
+  font-family: "SemiBold";
+  font-size: 0.9375rem;
+  line-height: 130%; /* 1.21875rem */
+  letter-spacing: -0.00938rem;
+}
+
+.store-detail-page__menuList__item__hit {
+  color: #d82356;
+  font-family: "KBold";
   font-size: 0.9375rem;
   line-height: 130%; /* 1.21875rem */
   letter-spacing: -0.00938rem;
+  margin-left: 0.25rem;
 }
 
 .store-detail-page__menuList__item__cost {

diff --git a/src/pages/StoreDetailPage/StoreDetailPage.jsx b/src/pages/StoreDetailPage/StoreDetailPage.jsx
@@ -186,6 +186,11 @@ const StoreDetailPage = () => {
               >
                 <div className="store-detail-page__menuList__item__name">
                   {item?.name}
+                  {item?.hit && (
+                    <span className="store-detail-page__menuList__item__hit">
+                      HIT
+                    </span>
+                  )}
                 </div>
                 {inout === "2" && item?.price !== item?.sale ? (
                   <div>