Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Style: 주문 내역 & 상세 스타일 수정 #45

Merged
merged 2 commits into from
Nov 16, 2023
Merged

Style: 주문 내역 & 상세 스타일 수정 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82b5855
Style: 주문 내역 & 상세 스타일 수정
hhbb0081 Nov 16, 2023
e6b796b
Merge remote-tracking branch 'upstream/test' into test
hhbb0081 Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions src/components/views/StateBox/StateBox.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@

.order-box.selected{
width: 100%;
height: 15%;
/* height: 15%; */
/* height: 8.75rem; */
height: 7.5rem;
background-color: #FFE2ED;
padding: 3% 0;
border-top: 0.3vh solid #D82356;
border-top: 0.125rem solid #D82356;
}

.order-box{
width: 100%;
height: 15%;
/* height: 15%; */
height: 7.5rem;
background-color: #fff;
padding: 3% 0;
border-top: 0.3vh solid #DADADA;
border-top: 0.125rem solid #DADADA;
}

.status-bar{
display: flex;
flex-direction: row;

/* width: calc(100% - 3rem); */
width: 94%;
/* min-width: 94%; */
height: 2rem;
margin: 0 auto;

Expand All @@ -30,6 +33,7 @@
.status-date{
font-size: 12px;
color: #838383;
white-space: nowrap;
}

.status-box.selected{
Expand All @@ -40,7 +44,8 @@
height: 50%;
text-align: center;
border-radius: 10px;
background-color: #fff;;
background-color: #fff;
white-space: nowrap;
}

.status-box{
Expand All @@ -51,7 +56,8 @@
height: 50%;
text-align: center;
border-radius: 10px;
background-color: #fff;;
background-color: #fff;
white-space: nowrap;
}

.order-content{
Expand All @@ -71,10 +77,15 @@
background-color: #666;
}

.cafe-img-box{
margin-right: 0.0625rem;
}

.cafe-box{
width: 70%;
height: 100%;
margin: 0 auto;
/* padding: 0 0 0 0.625rem; */
}

.cafe-name{
Expand All @@ -87,12 +98,14 @@
/* padding: 0.4375em 0; */
height: 40%;
align-items: center;
white-space: nowrap;
}

.menu-name{
height: 60%;
color: #838383;
font-size: 12px;
font-family: "Medium";
text-decoration: none
text-decoration: none;
white-space: nowrap;
}
4 changes: 3 additions & 1 deletion src/components/views/StateBox/StateBox.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ const StateBox = ( {id, date, name, menu, state} ) => {
</div>
</div>
<div className="order-content">
<img src={cafe} alt={cafe}/>
<div className="cafe-img-box">
<img src={cafe} alt={cafe}/>
</div>
<div className="cafe-box">
<div className="cafe-name">{name}</div>
<div className="menu-name">{menu}</div>
Expand Down
9 changes: 4 additions & 5 deletions src/pages/OrderDetail/OrderDetail.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@
justify-content: flex-end;

width: 100%;
margin-top: 0.625rem;
/* height: 100%; */
margin-top: 1.5625rem;
}

.detail-content{
width: 95%;
height: 85%;
height: 100%;
margin: 0 auto;
/* background-color: #d9d9d9; */
box-shadow: 0 1px 12px rgba(0,0,0,0.25);
border-radius: 1.875rem 1.875rem 0 0;
padding: 1.9375rem 0;
/* overflow-y: auto; */
}

.detail-scroll-content{}

.detail-content::-webkit-scrollbar {
display: none;
}
Expand Down
38 changes: 38 additions & 0 deletions src/pages/OrderDetail/OrderDetail.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,44 @@ const OrderDetail = () => {
<span>3,500원</span>
</div>
</div>

<div className="detail-order__box">
<div className="detail-order-left__box">
<div className="detail-menu-img__wrapper"><img src={americano} alt="americano"/></div>
<div className="detail-order-menu__wrapper">
<span className="detail-order-menu__title">아메리카노</span>
<span className="detail-order-menu-option">ICE / LARGE / 1</span>
</div>
</div>
<div className="detail-order-right__box">
<span>3,500원</span>
</div>
</div>

<div className="detail-order__box">
<div className="detail-order-left__box">
<div className="detail-menu-img__wrapper"><img src={americano} alt="americano"/></div>
<div className="detail-order-menu__wrapper">
<span className="detail-order-menu__title">아메리카노</span>
<span className="detail-order-menu-option">ICE / LARGE / 1</span>
</div>
</div>
<div className="detail-order-right__box">
<span>3,500원</span>
</div>
</div>
<div className="detail-order__box">
<div className="detail-order-left__box">
<div className="detail-menu-img__wrapper"><img src={americano} alt="americano"/></div>
<div className="detail-order-menu__wrapper">
<span className="detail-order-menu__title">아메리카노</span>
<span className="detail-order-menu-option">ICE / LARGE / 1</span>
</div>
</div>
<div className="detail-order-right__box">
<span>3,500원</span>
</div>
</div>
</div>
<div className="detail-line"></div>
<div className="detail-bottom__wrapper">
Expand Down
4 changes: 3 additions & 1 deletion src/pages/OrderStatus/OrderStatus.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
position: absolute;
top: 2.125rem;
right: calc(5% + 6.3125rem * 0.16);
/* width: 6.3125rem; */
width: 6.3125rem;
height: 1.5rem;
}

Expand Down Expand Up @@ -206,6 +206,7 @@
font-size: 0.8125rem;
font-family: "bold";
width: 27%;
white-space: nowrap;
}

.status-content{
Expand All @@ -216,6 +217,7 @@
font-size: 0.9375rem;
font-family: "bold";
width: 63%;
white-space: nowrap;
}

.status-detail{
Expand Down