Merge branch 'dev2' of github.com:sitcon-tw/2021 into dev2

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": {

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%;

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;

src/components/CFP/Intro.vue.old

@@ -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;" />
@@ -118,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"

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',