Merge pull request #138 from Gosrock/dev

Dev
Gosrock · Feb 13, 2022 · f959965 · f959965
2 parents 25088a0 + 5b2a012
commit f959965
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/stories/Components/TicketList/TicketList.css b/src/stories/Components/TicketList/TicketList.css
@@ -8,10 +8,16 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
-  padding: 15px;
+  padding: 15px 20px;
   box-sizing: border-box;
 }
 
+@media screen and (max-with: 450px) {
+  .TicketList-item {
+    padding: 15px 6%;
+  }
+}
+
 @media screen and (max-width: 350px) {
   .TicketList-icon {
     display: none;
@@ -61,7 +67,7 @@
   width: calc(50% - 0.5px);
   display: flex;
   align-items: center;
-  justify-content: right;
+  justify-content: flex-end;
   z-index: 2;
   height: 50px;
 }

diff --git a/src/stories/Components/TicketList/TicketList.jsx b/src/stories/Components/TicketList/TicketList.jsx
@@ -21,11 +21,15 @@ export const TicketList = ({ onClickQR, ...props }) => {
           }}
         >
           <Car />
-          <div style={{ fontWeight: '700', marginLeft: '13px' }}>오시는 길</div>
+          <div style={{ fontWeight: '700', marginLeft: '13px', Color: '#000' }}>
+            오시는 길
+          </div>
         </div>
         <div className={'TicketList-rec'}></div>
         <div className="TicketList-button-right" onClick={onClickQR}>
-          <div style={{ fontWeight: '700', marginRight: '13px' }}>
+          <div
+            style={{ fontWeight: '700', marginRight: '13px', color: '#000' }}
+          >
             QR코드 보기
           </div>
           <QR />