Merge branch 'main' of github.com:gdsc-ncku/BikeFestival17th-Frontend…

… into jason
gdsc-ncku · Feb 20, 2024 · 1ac3883 · 1ac3883
2 parents a0b8fba + 45cbbb6
commit 1ac3883
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/data/activities.json b/src/data/activities.json
@@ -31,7 +31,7 @@
     "img": "activities/2024_Bike_LifeCrossroads.webp",
     "url": "/activities/lifeCrossroads",
     "title": "人生叉路口",
-    "brief": "Lorem ipsum",
+    "brief": "在升學的重重關卡中，當生活引領你走到叉路口時，選擇的方向不僅塑造你的旅程，更描繪出獨特的人生畫卷。",
     "intro": "<p>在升學的重重關卡中，當生活引領你走到叉路口時，選擇的方向不僅塑造你的旅程，更描繪出獨特的人生畫卷。這次遊戲將是你人生旅途中的一頁，<span class='text-primary'>不同的結局，都將成為你獨特的故事</span>。</p>"
   },
   {

diff --git a/src/data/event.json b/src/data/event.json
@@ -536,7 +536,7 @@
     "id": "42",
     "name": "學習歷程撰寫心法分享 | 王榮春先生",
     "activity": "升學指南",
-    "project": "學習歷程講座",
+    "project": "學習歷程特邀講座",
     "description": "本屆單車節與104人力銀行合作，除了共同協作免費線上懶人包供不論是否能前來單車節的高中生領取，亦邀請到了104人力銀行的職涯教育長 - 王榮春先生，於單車節當日舉辦演講分享學習歷程撰寫心法。",
     "date": "3/3",
     "startTime": "15:00",

diff --git a/src/views/forum/LetterToHighSchoolStudents.vue b/src/views/forum/LetterToHighSchoolStudents.vue
@@ -1,7 +1,7 @@
 <template>
   <Breadcrumb />
-  <div class="mx-[9.75rem]">
-    <div class="text-5xl font-bold mb-8">給高中生的一封信</div>
+  <div class="layout_content">
+    <div class="text-4xl font-bold mb-8">給高中生的一封信</div>
     <WorkInProgress />
   </div>
 </template>

diff --git a/src/views/info/Schedule.vue b/src/views/info/Schedule.vue
@@ -2,7 +2,7 @@
   <!-- center container (on laptop) -->
   <div class="w-fill sm:flex hidden justify-center flex-col">
     <!-- Date tabs -->
-    <div class="date-tabs">
+    <div class="date-tabs mb-5">
       <button
         class="date-tab"
         :class="{ active: selectedDate === '3/2' }"
@@ -24,7 +24,7 @@
       <!-- left time list -->
       <div class="w-fill flex justify-start mt-11">
         <!-- time line -->
-        <div class="flex flex-col gap-[150px] max-w-full">
+        <div class="flex flex-col gap-[150px] max-w-full border-r-2 ">
           <div
             class="w-fill flex justify-center gap-[40px]"
             v-for="index in 10"
@@ -165,7 +165,7 @@
       }`"
       @click="selectedDate = key"
     >
-      {{ `DAY ${i + 1} ${key}` }}
+      {{ `DAY ${i + 1} | ${key}` }}
     </button>
   </div>
 </template>
@@ -227,7 +227,7 @@ const showModal = ref(false);
 const showTutorial = ref(true);
 // process event data before mount
 /*
-  schema : 
+  schema :
   {
     "2024/3/2" : {
       "舞台活動" : [event1, event2, ...],
@@ -389,10 +389,9 @@ onMounted(() => {
 }
 
 .date-tab {
-  background-color: #ffa500;
   /* Orange color */
-  color: white;
-  border: none;
+  color: #ff4500;
+  border: 2px solid #ff4500;
   padding: 10px 20px;
   margin: 0 10px;
   cursor: pointer;
@@ -411,6 +410,7 @@ onMounted(() => {
 
 .active {
   background-color: #ff4500;
+  color: white;
   /* Darker orange for the active button */
 }
 </style>