Merge pull request #8 from Good-Smart/feat/question

Feat/question
kimyenida · Apr 17, 2023 · 2e8b22e · 2e8b22e
2 parents b021577 + 642950a
commit 2e8b22e
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/Challenge.html b/Challenge.html
@@ -40,6 +40,10 @@
             text-align: center;
             line-height: 56px;
         }
+        * {
+            font-family: 'Song Myung', serif;
+        }
+
     </style>
 </head>
 
@@ -51,7 +55,6 @@
     height: 38px;
     left: 126px;
     top: 69px;
-    font-family: 'Irish Grover';
     font-style: normal;
     font-weight: 400;
     font-size: 28px;
@@ -65,7 +68,6 @@
     height: 22.59px;
     left: 51.15px;
     top: 133px;
-    font-family: 'Inter';
     font-style: normal;
     font-weight: 400;
     font-size: 16px;
@@ -85,7 +87,6 @@
     height: 22.59px;
     left: 111.15px;
     top: 626px;
-    font-family: 'Inter';
     font-style: normal;
     font-weight: 400;
     font-size: 16px;
@@ -95,7 +96,6 @@
 
     <div class="money">
         <h1 style="
-        font-family: 'Inter';
         font-style: normal;
         font-weight: 400;
         font-size: 20px;
@@ -106,7 +106,6 @@
 
     <div class="donate">
         <h1 style="
-        font-family: 'Inter';
         font-style: normal;
         font-weight: 400;
         font-size: 20px;

diff --git a/MyPage.html b/MyPage.html
@@ -67,6 +67,10 @@
         .bottom_menu>div>img {
             float: center;
         }
+
+        * {
+            font-family: 'Song Myung', serif;
+        }
     </style>
 </head>
 
@@ -77,26 +81,26 @@
         마이페이지</h1>
     <div class="info">
         <h1
-            style="float: left; position: relative; left: 15px; top: 5px; font-family: 'Inter'; font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
+            style="float: left; position: relative; left: 15px; top: 5px;  font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
             내가 모은 포인트</h1>
         <h1
-            style="position: relative; left: 130px; top: 5px; font-family: 'Inter'; font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
+            style="position: relative; left: 130px; top: 5px;  font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
             1050P</h1>
         <h1
-            style="float: left; position: relative; left: 15px; top: -7px; font-family: 'Inter'; font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
+            style="float: left; position: relative; left: 15px; top: -7px;  font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
             연속 출석 일수</h1>
         <h1
-            style="position: relative; left: 160px; top: 5px; font-family: 'Inter'; font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);;">
+            style="position: relative; left: 160px; top: 5px;  font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);;">
             3일</h1>
     </div>
     <h1
-        style="float: left; position:absolute; width: 105.5px; height: 12.59px; left: 56.15px; top: 210px; font-family: 'Inter'; font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
+        style="float: left; position:absolute; width: 105.5px; height: 12.59px; left: 56.15px; top: 210px;  font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
         요즘 나는</h1>
     <h1
-        style="position: absolute; width: 109.98px; height: 22.59px; left: 240px; top: 210px; font-family: 'Inter'; font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
+        style="position: absolute; width: 109.98px; height: 22.59px; left: 240px; top: 210px;  font-style: normal; font-weight: 400; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
         걱정이 많아요</h1>
     <h1
-        style="position: absolute; width: 63.93px; height: 22.59px; left: 40.15px; top: 270px; font-family: 'Inter'; font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
+        style="position: absolute; width: 63.93px; height: 22.59px; left: 40.15px; top: 270px;  font-style: normal; font-weight: 600; font-size: 16px; line-height: 19px; color: #000000; transform: rotate(0.37deg);">
         챌린지</h1>
     <div class="challenge">
         <table style="border:1px; margin-left:auto; margin-right:auto;">
@@ -134,7 +138,7 @@
     </div>
     <div class="today">
         <h1
-            style="float: left; position: relative; width: 228px; height: 23px; left: 15px; top: 7px; font-family: 'Inter'; font-style: normal; font-weight: 500; font-size: 16px; line-height: 19px; color: #000000;">
+            style="float: left; position: relative; width: 228px; height: 23px; left: 15px; top: 7px;  font-style: normal; font-weight: 500; font-size: 16px; line-height: 19px; color: #000000;">
             3월 넷째 주 기록 분석 보러가기</h1>
         <img style="float: left; position: relative; width: 11px; height: 17px; left: 60px; top: 20px;"
             src="img/Chevron.png" />

diff --git a/question.html b/question.html
@@ -13,7 +13,7 @@
             background-image: url('./img/background.jpg');
             background-size: 390px 844px;
             background-repeat: no-repeat;
-            margin: 0 35px;
+            width: 390px;
         }
     </style>
 </head>

diff --git a/save_result.html b/save_result.html
@@ -98,13 +98,13 @@
         <div>
             <p>"오늘 후회되는 일이 있나요?"</p>
             <div class="answer_box">
-            <p>아 어제 좀 더 잘걸</p>
+            <p>아 어제 좀 더 잘걸<br/>그럼 친구들한테 더 상냥하게 대할 수 있지 않았을까요</p>
         </div>
         </div>
         <div>
             <p>"내일은 무엇을 하고 싶나요?"</p>
             <div class="answer_box">
-            <p>아무것도 안할래요 그냥,,</p>
+            <p>내일은 공부를 더 열심히 할거에요! 그리고 공부하는 다른 친구들에게 피해가 가지 않도록 주의할거에요.</p>
         </div>
         </div>
         <div class="result_box">