fix: qa 적용 h2 사이즈, main 폰트, activity 마진, header 아이콘

Nexters · Oct 21, 2021 · 13e8b82 · 13e8b82
1 parent b1e07f3
commit 13e8b82
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 22 deletions.
diff --git a/assets/css/typography.scss b/assets/css/typography.scss
@@ -29,8 +29,8 @@ h2.m {
 
 h2.d {
   font-weight: $bold-weight;
-  font-size: 60px;
-  line-height: 90px;
+  font-size: 48px;
+  line-height: 64px;
   letter-spacing: -0.02em;
 }
 

diff --git a/components/about/activity/card.vue b/components/about/activity/card.vue
@@ -65,7 +65,7 @@ export default ActivityCard;
 @include tablet {
   .activity-container {
     border-radius: 16px;
-    width: calc(50% - 24px);
+    width: calc(50% - 16px);
     height: 324px;
     background: rgba(0, 0, 0, 0.5);
     .contents {

diff --git a/components/header.vue b/components/header.vue
@@ -2,7 +2,11 @@
   <nav class="navigation">
     <div :class="{ 'nav-header': true, overlay: isMenuOpen }">
       <nuxt-link to="/" class="logo" prefetch>
-        <img :src="img_logo" alt="NEXTERS_IMAGE_LOGO" />
+        <img
+          :style="`display: ${isMenuOpen ? 'none' : 'block'}`"
+          :src="img_logo"
+          alt="NEXTERS_IMAGE_LOGO"
+        />
         <img class="text-logo" :src="txt_logo" alt="NEXTERS_TEXT_LOGO" />
       </nuxt-link>
       <div class="menu" @click="toggleMenu">

diff --git a/pages/about.vue b/pages/about.vue
@@ -224,8 +224,8 @@ export default defineComponent({
     .title {
       font-style: normal;
       font-weight: bold;
-      font-size: 60px;
-      line-height: 90px;
+      font-size: 48px;
+      line-height: 64px;
       letter-spacing: -0.02em;
       white-space: pre-wrap;
 
@@ -355,8 +355,8 @@ export default defineComponent({
     .title {
       font-style: normal;
       font-weight: bold;
-      font-size: 60px;
-      line-height: 90px;
+      font-size: 48px;
+      line-height: 64px;
       letter-spacing: -0.02em;
       white-space: pre-wrap;
 

diff --git a/pages/index.vue b/pages/index.vue
@@ -133,6 +133,7 @@ export default defineComponent({
 <style lang="scss" scoped>
 @import "~/assets/css/_device.scss";
 @import "~/assets/css/setting.scss";
+@import url("https://fonts.googleapis.com/css2?family=Montserrat:wght@800&display=swap");
 
 * {
   font-family: Spoqa Han Sans Neo;
@@ -166,9 +167,10 @@ a {
       height: 208px;
       padding: 148.5px 24px 148.5px 24px;
       .title {
+        font-family: "Montserrat", sans-serif;
         white-space: pre-wrap;
         font-style: normal;
-        font-weight: 900;
+        font-weight: 800;
         font-size: 40px;
         line-height: 47.73px;
       }
@@ -217,6 +219,7 @@ a {
       margin: auto;
       padding: 64px;
       .title {
+        font-family: "Montserrat", sans-serif;
         white-space: pre-wrap;
         font-style: normal;
         font-weight: 900;
@@ -265,6 +268,7 @@ a {
       margin: auto;
       padding: 64px;
       .title {
+        font-family: "Montserrat", sans-serif;
         white-space: pre-wrap;
         font-style: normal;
         font-weight: 900;

diff --git a/pages/project/index.vue b/pages/project/index.vue
@@ -4,9 +4,9 @@
       <ProjectDetail :project="project" />
       <div class="contents">
         <div class="title">
-          <h1>Look Around</h1>
+          <h2>Look Around</h2>
           <div class="has-sup">
-            <h1>Our Projects</h1>
+            <h2>Our Projects</h2>
             <sup v-if="total > 0" class="total">{{ total }}</sup>
           </div>
         </div>
@@ -111,11 +111,11 @@ body.scroll-hidden {
       .title {
         display: flex;
         flex-direction: row;
-        h1 {
+        h2 {
           font-style: normal;
           font-weight: bold;
-          font-size: 60px;
-          line-height: 90px;
+          font-size: 48px;
+          line-height: 64px;
           letter-spacing: -0.02em;
         }
         .has-sup {
@@ -177,11 +177,11 @@ body.scroll-hidden {
       .title {
         display: flex;
         flex-direction: column;
-        h1 {
+        h2 {
           font-style: normal;
           font-weight: bold;
-          font-size: 60px;
-          line-height: 90px;
+          font-size: 48px;
+          line-height: 64px;
           letter-spacing: -0.02em;
         }
         .has-sup {
@@ -242,11 +242,11 @@ body.scroll-hidden {
       .title {
         display: flex;
         flex-direction: column;
-        h1 {
+        h2 {
           font-style: normal;
           font-weight: bold;
-          font-size: 60px;
-          line-height: 90px;
+          font-size: 48px;
+          line-height: 64px;
           letter-spacing: -0.02em;
         }
         .has-sup {
@@ -304,7 +304,7 @@ body.scroll-hidden {
       .title {
         display: flex;
         padding-left: 16px;
-        h1 {
+        h2 {
           font-style: normal;
           font-weight: bold;
           font-size: 32px;
@@ -371,7 +371,7 @@ body.scroll-hidden {
       .title {
         display: flex;
         flex-direction: column;
-        h1 {
+        h2 {
           font-style: normal;
           font-weight: bold;
           font-size: 32px;