From 265dd81d39847e1be6f2a9df99dd1c9745f10321 Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Tue, 19 Jan 2021 23:46:16 +0800
Subject: [PATCH 1/3] [optimize] connect header and introd

---
 src/assets/scss/CFP/intro.scss |  2 +-
 src/components/CFP/Intro.vue   | 12 ------------
 src/pages/CFP.vue              |  2 +-
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/assets/scss/CFP/intro.scss b/src/assets/scss/CFP/intro.scss
index 62e75c9..6d7f3c2 100644
--- a/src/assets/scss/CFP/intro.scss
+++ b/src/assets/scss/CFP/intro.scss
@@ -64,7 +64,7 @@ $buttonHoverBg: #226bb4;
     color: $fontColor;
     // size
     margin-left: 15%;
-    margin-top: 50%;
+    margin-top: 75px;
 
     @media screen and(max-width: 414px) {
       width: 100%;
diff --git a/src/components/CFP/Intro.vue b/src/components/CFP/Intro.vue
index bc61c0d..a4ff61a 100644
--- a/src/components/CFP/Intro.vue
+++ b/src/components/CFP/Intro.vue
@@ -1,18 +1,6 @@
 <template>
   <main class="introduction-container">
     <div class="introduction">
-      <img src="@/assets/images/cfp/Ellipse 5.svg" class="ellipse"/>
-            <img src="@/assets/images/cfp/Group 10.svg" class="sitcon-icon"/>
-            <img src="@/assets/images/cfp/Path 733.svg" class="sitcon-pic-2021"/>
-            <img src="@/assets/images/cfp/Path 734.svg" class="sitcon-title-zh"/>
-            <img src="@/assets/images/cfp/Path 735.svg" class="sitcon-topic"/>
-            <img src="@/assets/images/cfp/Path 736.svg" class="sitcon-date"/>
-            <img src="@/assets/images/cfp/Path 737.svg" class="sitcon-place"/>
-            <img src="@/assets/images/cfp/Path 738.svg" class="sitcon-qeury"/>
-            <!-- ../../assets/images/cfp/Mobile/Mobile-background.svg -->
-            <img src="@/assets/images/cfp/Background.svg" class="background"/>
-            <!-- src="@/assets/images/cfp/Background.svg" -->
-            <!-- first part -->
             <img src="@/assets/images/cfp/Path 740.svg" class="SITCON-text-path"/>
             <svg width="1200" height="1000" class="first-box">
               <rect width="1200" height="1000" style="fill:#ffffff;" />
diff --git a/src/pages/CFP.vue b/src/pages/CFP.vue
index 6fa05ae..b9508a8 100644
--- a/src/pages/CFP.vue
+++ b/src/pages/CFP.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="cfp" class="cfp cfp-background">
-    <!-- CfpHeader id="cfp-header"/ -->
+    <CfpHeader id="cfp-header"/>
     <Intro id="cfp-intro"></Intro>
     
   </div>

From bb18d1b7ef6b4fa4c9551717c50b71f70d4efea9 Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Wed, 20 Jan 2021 00:02:52 +0800
Subject: [PATCH 2/3] [fix] / redirect to /cfp

---
 package.json        | 2 +-
 src/router/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 0376a63..a6559bc 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021 && mv ./dist/app.html ./dist/index.html",
+    "build": "vue-cli-service build && mv ./dist/2021/* ./dist && rm -rf 2021 && cp ./dist/app.html ./dist/index.html",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
diff --git a/src/router/index.ts b/src/router/index.ts
index 27050d5..d9f00c0 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -10,7 +10,7 @@ export const routes: RouteConfig[] = [
   {
     path: '/',
     name: 'Home',
-    component: CFP,
+    redirect: '/cfp',
     meta: {
       index: 0,
       label: 'SITCON 2021',

From aa128a258e4ef1c64786a5c51ca379712000dbbf Mon Sep 17 00:00:00 2001
From: mysper <anthony.a3203@gmail.com>
Date: Wed, 20 Jan 2021 00:34:24 +0800
Subject: [PATCH 3/3] [optimize] reize qa box and change the link for button

---
 src/assets/scss/news/agenda.scss | 3 ++-
 src/components/CFP/Header.vue    | 2 +-
 src/components/CFP/Intro.vue     | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/assets/scss/news/agenda.scss b/src/assets/scss/news/agenda.scss
index c03edbf..100d85d 100644
--- a/src/assets/scss/news/agenda.scss
+++ b/src/assets/scss/news/agenda.scss
@@ -216,13 +216,14 @@ $limitWidth: 80vw;
   }
 
   &-qa {
-    width: 1000px;
+    width: 100vw;
     &__itemBox {
       border-radius: 29px;
       box-shadow: 0 3px 12px 0 rgba(89, 120, 206, 0.56);
       background-color: $white;
       margin: 20px 0;
       padding: 10px 20px;
+      width: 80%;
       cursor: pointer;
       span {
         font-family: $fontFamily-NotoSansTC;
diff --git a/src/components/CFP/Header.vue b/src/components/CFP/Header.vue
index f950fc1..3e7da0b 100644
--- a/src/components/CFP/Header.vue
+++ b/src/components/CFP/Header.vue
@@ -57,7 +57,7 @@
       <div class="cfp-news">
         <div class="cfp-news-wrapper">
           <div class="hexagon">
-            <a href="/news" rel="noopener" class="btn">
+            <a href="/2021/cfp/news" rel="noopener" class="btn">
               <img
                 src="~@/assets/images/burnfont/news.svg"
                 class="svg"
diff --git a/src/components/CFP/Intro.vue b/src/components/CFP/Intro.vue
index a4ff61a..eaaae79 100644
--- a/src/components/CFP/Intro.vue
+++ b/src/components/CFP/Intro.vue
@@ -106,7 +106,7 @@
             <div class="cfp-deadline-content">
               <span class="h3">01/15 ～ 02/22</span
               ><span class="ml-2 mr-2">詳細時程請見</span
-              ><a class="btn btn-primary mr-2" rel="noopener" href="/news"
+              ><a class="btn btn-primary mr-2" rel="noopener" href="/2021/cfp/news"
                 >投稿資訊</a
               ><a
                 class="btn btn-primary"