Skip to content

Commit

Permalink
Merge pull request #263 from lotteon2/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
wakkpu authored Jan 21, 2024
2 parents 1123fc6 + b5c56be commit b84f4f2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/assets/css/coupon/coupon-item-component.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
height: 100%;
/* background-size: contain; */
background-repeat: no-repeat;
font-family: 'TheJamsil4Medium', sans-serif;
font-family: 'TheJamsil';
font-weight: 500;
color: white;
position: relative; /* 하위 컴포넌트가 absolute를 달 수 있도록 relative 명시 */
display: flex;
Expand Down
12 changes: 8 additions & 4 deletions src/assets/css/coupon/product-detail-coupon-modal.css
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@
flex-direction: column;
gap: 1vh;
font-size: 2rem;
font-family: 'TheJamsil4Medium';
font-family: 'TheJamsil';
font-weight: 500;
margin-bottom: 1vh;
}

Expand Down Expand Up @@ -104,7 +105,8 @@

.price-content {
text-align: center;
font-family: 'TheJamsil4Medium';
font-family: 'TheJamsil';
font-weight: 500;
font-size: 1.3rem;
}

Expand All @@ -118,7 +120,8 @@

.no-content {
font-size: 1.8rem;
font-family: 'TheJamsil4Medium';
font-family: 'TheJamsil';
font-weight: 500;
color: #c8c8c8;
align-self: center;
justify-content: center;
Expand All @@ -138,6 +141,7 @@
text-align: center;

font-size: 1.8rem;
font-family: 'TheJamsil4Medium';
font-family: 'TheJamsil';
font-weight: 500;
cursor: pointer;
}

0 comments on commit b84f4f2

Please sign in to comment.