Merge remote-tracking branch 'upstream/main' into feat/2024_staff_rev…

…iewers

components/core/header/nav-bar/NavBar.i18n.js

@@ -69,6 +69,6 @@ export default genI18nMessages({
         proposalSystemUrl: '投稿系統',
         codeOfConduct: '行為準則',
         cfpPoster: '如何投稿海報',
-        posterSession: '海報環節',
+        posterSession: '海報展',
     },
 })

components/core/layout/TwoColWrapper.vue

@@ -19,7 +19,7 @@ export default {
 
 <style lang="postcss" scpoed>
 .two-col-layout {
-    @media (min-width: 1024px) {
+    @media (min-width: 1194px) {
         grid-template-columns: 1fr 5fr;
     }
 }

i18n/sponsor/index.i18n.js

@@ -44,9 +44,6 @@ export default genI18nMessages({
             'If you are interested in the event, please leave contact information below, ' +
             'and we will provide the sponsorship packages detail to you. Or contact us ' +
             'directly via {contact} to get any further information.',
-        terms: {
-            contact: 'sponsorship@python.tw',
-        },
         cta: {
             text: 'Application Form',
         },
@@ -97,9 +94,6 @@ export default genI18nMessages({
         summary:
             '若想了解 PyConTW 2024 完整的贊助方案，歡迎點擊下方按鈕填寫表單留下您的聯絡資料' +
             '索取贊助書或是直接透過贊助組信箱 {contact} 聯絡我們，讓我們了解貴單位的需求！',
-        terms: {
-            contact: 'sponsorship@python.tw',
-        },
         cta: {
             text: '索取贊助書',
         },

pages/about/code-of-conduct.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="py-10 md:pb-24 lg:pb-24">
-        <banner>
+        <banner class="bg-center bg-no-repeat">
             <core-h1 :title="$t('title')"></core-h1>
             <p class="leading-6">
                 {{ $t('pageAbstract') }}
@@ -9,7 +9,7 @@
         <div class="mx-2 my-3 flex flex-wrap justify-center">
             <div v-for="(img, i) in introImgs" :key="`intro_img_${i}`">
                 <div
-                    class="mx-2 my-3 h-24 w-32 bg-contain bg-no-repeat md:mx-5 md:h-40 md:w-56"
+                    class="mx-2 my-3 h-24 w-32 rounded-lg bg-contain bg-cover bg-no-repeat md:mx-5 md:h-40 md:w-56"
                     :style="getImgStyle(img)"
                 ></div>
             </div>
@@ -176,13 +176,13 @@ import ExtLink from '@/components/core/links/ExtLink.vue'
 import IntroImg1 from '@/static/img/about/code-of-conduct/Intro-1.png'
 import IntroImg2 from '@/static/img/about/code-of-conduct/Intro-2.png'
 import IntroImg3 from '@/static/img/about/code-of-conduct/Intro-3.png'
-import Icon1 from '@/static/img/about/code-of-conduct/Icon-1.png'
-import Icon2 from '@/static/img/about/code-of-conduct/Icon-2.png'
-import Icon3 from '@/static/img/about/code-of-conduct/Icon-3.png'
-import ProcedureZh from '@/static/img/about/code-of-conduct/procedure-zh.png'
-import ProcedureZhRwd from '@/static/img/about/code-of-conduct/procedure-zh-rwd.png'
-import ProcedureEn from '@/static/img/about/code-of-conduct/procedure-en.png'
-import ProcedureEnRwd from '@/static/img/about/code-of-conduct/procedure-en-rwd.png'
+import Icon1 from '@/static/img/about/code-of-conduct/Icon-1.svg'
+import Icon2 from '@/static/img/about/code-of-conduct/Icon-2.svg'
+import Icon3 from '@/static/img/about/code-of-conduct/Icon-3.svg'
+import ProcedureZh from '@/static/img/about/code-of-conduct/procedure-zh.svg'
+import ProcedureZhRwd from '@/static/img/about/code-of-conduct/procedure-zh-rwd.svg'
+import ProcedureEn from '@/static/img/about/code-of-conduct/procedure-en.svg'
+import ProcedureEnRwd from '@/static/img/about/code-of-conduct/procedure-en-rwd.svg'
 import TwoColWrapper from '@/components/core/layout/TwoColWrapper'
 
 export default {
@@ -209,8 +209,6 @@ export default {
         bannerStyle() {
             return {
                 'background-image': `url(${this.aboutBanner})`,
-                'background-repeat': 'no-repeat',
-                'background-position': 'center',
             }
         },
         sub2Imgs() {
@@ -225,8 +223,6 @@ export default {
         getImgStyle(img) {
             return {
                 'background-image': `url(${img})`,
-                'border-radius': '5%',
-                'background-size': 'cover',
             }
         },
         getSub1Style(img) {
@@ -237,7 +233,6 @@ export default {
         getSub2Style(img) {
             return {
                 'background-image': `url(${img})`,
-                'background-position': 'center',
             }
         },
     },
@@ -298,7 +293,7 @@ export default {
 }
 
 .sub2_img {
-    @apply mx-2 my-2 hidden bg-no-repeat md:mx-5;
+    @apply mx-2 my-2 hidden bg-center bg-no-repeat md:mx-5;
     width: 30rem;
     height: 40rem;
 }

pages/conference/poster-session.vue

@@ -8,9 +8,15 @@
             </i18n>
         </banner>
         <i18n-page-wrapper class="px-2 sm:px-8 md:px-16 lg:px-32" custom-x>
+            <core-h2 :title="$t('location.title')"></core-h2>
+            <i18n path="location.description" tag="p"> </i18n>
+            <core-h2 :title="$t('time.title')"></core-h2>
+            <i18n path="time.description.main" tag="p"> </i18n>
+            <i18n path="time.description.sub" tag="p"> </i18n>
+            <core-h2 :title="$t('posters.title')"></core-h2>
             <div class="poster-session__container">
                 <article
-                    v-for="poster in $t('posters')"
+                    v-for="poster in $t('posters.list')"
                     :id="poster.id"
                     :key="poster.id"
                     class="poster-session__card"
@@ -80,6 +86,7 @@ import I18nPageWrapper from '@/components/core/i18n/PageWrapper'
 import i18n from '@/i18n/conference/poster-session.i18n'
 import Banner from '@/components/core/layout/Banner'
 import CoreH1 from '@/components/core/titles/H1'
+import CoreH2 from '@/components/core/titles/H2'
 import Modal from './_components/modal/Modal'
 
 export default {
@@ -88,21 +95,21 @@ export default {
     components: {
         Banner,
         CoreH1,
+        CoreH2,
         I18nPageWrapper,
         Modal,
     },
     data() {
         return {
             isOpened: false,
             selectedPoster: {
-                id: '1',
-                name: 'KK',
-                type: '社群講',
-                community: '台灣數位遊牧者社群',
-                topics: ['社群經營', '人際溝通', '經驗分享'],
-                title: '第一次當總召的我，竟然想在第一屆就辦三百人的年會',
-                summary:
-                    '分享如何舉辦第一屆的三百人年會，包含志工招募、遇到問題與解決方式、大變動等等',
+                id: '',
+                name: '',
+                type: '',
+                community: '',
+                topics: [],
+                title: '',
+                summary: '',
             },
         }
     },

pages/sponsor/index.vue

@@ -52,7 +52,7 @@
                     href="mailto:sponsorship@python.tw"
                     highlight
                     underline
-                    >{{ $t('terms.contact') }}</ext-link
+                    >sponsorship@python.tw</ext-link
                 >
             </template>
         </i18n>