Merge pull request #56 from yourssu/dev

[HOTFIX] 수정 사항 반영
yourssu · Mar 8, 2024 · aae059a · aae059a
2 parents ffafc4c + 6094459
commit aae059a
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 41 deletions.
diff --git a/src/assets/fonts/AppleSDGothicNeoEB.ttf b/src/assets/fonts/AppleSDGothicNeoEB.ttf
diff --git a/src/assets/fonts/AppleSDGothicNeoEB.woff b/src/assets/fonts/AppleSDGothicNeoEB.woff
diff --git a/src/assets/fonts/AppleSDGothicNeoR.ttf b/src/assets/fonts/AppleSDGothicNeoR.ttf
diff --git a/src/assets/fonts/AppleSDGothicNeoR.woff b/src/assets/fonts/AppleSDGothicNeoR.woff
diff --git a/src/assets/fonts/AppleSDGothicNeoSB.ttf b/src/assets/fonts/AppleSDGothicNeoSB.ttf
diff --git a/src/assets/fonts/AppleSDGothicNeoSB.woff b/src/assets/fonts/AppleSDGothicNeoSB.woff
diff --git a/src/assets/fonts/Jost-VariableFont.woff b/src/assets/fonts/Jost-VariableFont.woff
diff --git a/src/assets/fonts/Jost-VariableFont_wght.ttf b/src/assets/fonts/Jost-VariableFont_wght.ttf
diff --git a/src/assets/fonts/Roboto-Medium.ttf b/src/assets/fonts/Roboto-Medium.ttf
diff --git a/src/assets/fonts/Roboto-Medium.woff b/src/assets/fonts/Roboto-Medium.woff
diff --git a/src/containers/description/InaWord/index.tsx b/src/containers/description/InaWord/index.tsx
@@ -63,6 +63,8 @@ const Word = tw.div`
   xs:body6
 
   whitespace-pre-wrap
+  sm:whitespace-normal
+  xs:whitespace-normal
   text-blue-0
 `;
 
@@ -73,6 +75,8 @@ const DescriptionContainer = tw.div`
   xs:body7
 
   whitespace-pre-wrap
+  sm:whitespace-normal
+  xs:whitespace-normal
   text-gray1-0
 `;
 

diff --git a/src/containers/select/Banner/index.tsx b/src/containers/select/Banner/index.tsx
@@ -36,7 +36,7 @@ function Banner({ moveSupporting }: { moveSupporting: () => void }) {
         </SubContainer1>
       )}
 
-      <SubContainer2 className="flex flex-col items-center text-center">
+      <SubContainer2 className="flex flex-col items-center text-center font-Roboto">
         <BannerTitle>
           {bannerDescription.recruitingDate.year}&apos;YOURSSU <br /> RECRUITING
         </BannerTitle>
@@ -107,7 +107,6 @@ const BannerImage = tw.img`
 
 // text component
 const BannerTitle = tw.p`
-  font-Roboto 
   font-[900] 
   text-[230px]
   text-bluegray2-0

diff --git a/src/containers/select/FAQ/QuestionCard.tsx b/src/containers/select/FAQ/QuestionCard.tsx
@@ -25,8 +25,8 @@ export default function QuestionCard({
       className="flex flex-col"
       onClick={handlerQuestionOnclick}
     >
-      <div className="flex items-center justify-between">
-        <div className="flex items-center gap-[12px] sm:gap-[8px]">
+      <div className="flex items-center justify-between xs:gap-[20px] sm:gap-[20px]">
+        <div className="flex items-center gap-[12px] xs:gap-[8px] sm:gap-[8px]">
           <Q>Q</Q>
           <Text>{question}</Text>
         </div>
@@ -49,24 +49,26 @@ const Container = tw.div<{ $windowSize: boolean }>`
   w-[1280px]
   lg:w-[1080px]
   md:w-[720px]
-  ${(prop) => (prop.$windowSize ? 'sm:w-[530px]' : 'w-[330px]')}
-  xs:w-[330px]
+  ${(prop) => (prop.$windowSize ? 'sm:w-[530px]' : 'w-[350px]')}
+  xs:w-[350px]
 
   rounded-[16px] 
   bg-white-0 
   p-[32px]
 
+  sm:p-[20px]
+  xs:p-[20px]
+
   gap-[20px]
 
   cursor-pointer
 `;
 
 const Q = tw.span`
-  font-PretendardSB
-  text-[32px] 
-  font-[700] 
-  leading-[28px] 
-  tracking-[-0.64px] 
+  h3
+
+  sm:h4
+  xs:h4
 
   bg-gradient-to-r 
   from-mainGra2-0 
@@ -79,21 +81,12 @@ const Text = tw.p`
   w-full
   h-auto
   text-gray1-0
-  font-PretendardR
-  text-[24px]
-  font-[500] 
-  leading-[24px] 
-  tracking-[-2%] 
+  font-[600]
+
+  h4
   
-  sm:text-[21px]
-  sm:font
-  sm:leading-[24px]
-  sm:tracking-[-0.42px]
-
-  xs:text-[21px]
-  xs:font
-  xs:leading-[24px]
-  xs:tracking-[-0.42px]
+  sm:body4
+  xs:body4
 `;
 
 const QuestionIcon = tw.img`

diff --git a/src/containers/select/FAQ/index.tsx b/src/containers/select/FAQ/index.tsx
@@ -29,12 +29,7 @@ const Container = tw.div`
 `;
 
 const FAQText = tw.span`
-  font-PretendardSB
-  text-[50px] 
-  font-[600] 
-  leading-[59.67px] 
-  tracking-[-1%]
-
+  h2
   sm:h3
   xs:h3
 `;

diff --git a/src/containers/select/Ideal/index.tsx b/src/containers/select/Ideal/index.tsx
@@ -33,11 +33,13 @@ function Ideal() {
             <div className=" text-center">
               <IdealText>{value.title}</IdealText>
             </div>
-            <IdealImage
-              $index={index}
-              src={imgData.idealImgData.nodes[0].publicURL}
-              alt={imgData.idealImgData.nodes[0].name}
-            />
+            {index !== 3 ? (
+              <IdealImage
+                $index={index}
+                src={imgData.idealImgData.nodes[0].publicURL}
+                alt={imgData.idealImgData.nodes[0].name}
+              />
+            ) : null}
           </Container>
         );
       })}

diff --git a/src/styles/global.css b/src/styles/global.css
@@ -4,27 +4,27 @@
 
 @font-face {
   font-family: 'Roboto';
-  src: url('../../src/assets/fonts/Roboto-Medium.ttf');
+  src: url('../../src/assets/fonts/Roboto-Medium.woff');
 }
 
 @font-face {
   font-family: 'NeoSB';
-  src: url('../../src/assets/fonts/AppleSDGothicNeoSB.ttf');
+  src: url('../../src/assets/fonts/AppleSDGothicNeoSB.woff');
 }
 
 @font-face {
   font-family: 'NeoR';
-  src: url('../../src/assets/fonts/AppleSDGothicNeoR.ttf');
+  src: url('../../src/assets/fonts/AppleSDGothicNeoR.woff');
 }
 
 @font-face {
   font-family: 'NeoEB';
-  src: url('../../src/assets/fonts/AppleSDGothicNeoEB.ttf');
+  src: url('../../src/assets/fonts/AppleSDGothicNeoEB.woff');
 }
 
 @font-face {
   font-family: 'Jost';
-  src: url('../../src/assets/fonts//Jost-VariableFont_wght.ttf');
+  src: url('../../src/assets/fonts//Jost-VariableFont.woff');
 }
 
 @font-face {