diff --git a/src/assets/image.backup/2018.png b/src/assets/image.backup/2018.png deleted file mode 100644 index a28d679..0000000 Binary files a/src/assets/image.backup/2018.png and /dev/null differ diff --git a/src/assets/image.backup/2019.png b/src/assets/image.backup/2019.png deleted file mode 100644 index 951011c..0000000 Binary files a/src/assets/image.backup/2019.png and /dev/null differ diff --git a/src/assets/image.backup/2020.png b/src/assets/image.backup/2020.png deleted file mode 100644 index 8b3ee5e..0000000 Binary files a/src/assets/image.backup/2020.png and /dev/null differ diff --git a/src/assets/image.backup/CFPBackground.svg b/src/assets/image.backup/CFPBackground.svg deleted file mode 100644 index 65107e4..0000000 --- a/src/assets/image.backup/CFPBackground.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/image.backup/Path 740.svg b/src/assets/image.backup/Path 740.svg deleted file mode 100644 index 803d49d..0000000 --- a/src/assets/image.backup/Path 740.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/image.backup/Path 762.svg b/src/assets/image.backup/Path 762.svg deleted file mode 100644 index 001cabf..0000000 --- a/src/assets/image.backup/Path 762.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/image.backup/paper/paper.png b/src/assets/image.backup/paper/paper.png deleted file mode 100644 index 520840c..0000000 Binary files a/src/assets/image.backup/paper/paper.png and /dev/null differ diff --git a/src/assets/image.backup/paper/paper@2x.png b/src/assets/image.backup/paper/paper@2x.png deleted file mode 100644 index 90ab4bb..0000000 Binary files a/src/assets/image.backup/paper/paper@2x.png and /dev/null differ diff --git a/src/assets/image.backup/sitcon-icon.svg b/src/assets/image.backup/sitcon-icon.svg deleted file mode 100644 index 090dbd6..0000000 --- a/src/assets/image.backup/sitcon-icon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/images/CFP/2018.png b/src/assets/images/CFP/2018.png index a28d679..70c4a6f 100644 Binary files a/src/assets/images/CFP/2018.png and b/src/assets/images/CFP/2018.png differ diff --git a/src/assets/images/CFP/2019.png b/src/assets/images/CFP/2019.png index 951011c..b4d5a9c 100644 Binary files a/src/assets/images/CFP/2019.png and b/src/assets/images/CFP/2019.png differ diff --git a/src/assets/images/CFP/2020.png b/src/assets/images/CFP/2020.png index 8b3ee5e..451f0d2 100644 Binary files a/src/assets/images/CFP/2020.png and b/src/assets/images/CFP/2020.png differ diff --git a/src/assets/images/CFP/paper/paper.png b/src/assets/images/CFP/paper/paper.png index 520840c..d9f6a52 100644 Binary files a/src/assets/images/CFP/paper/paper.png and b/src/assets/images/CFP/paper/paper.png differ diff --git a/src/assets/images/CFP/paper/paper@2x.png b/src/assets/images/CFP/paper/paper@2x.png index 90ab4bb..a7d6aa6 100644 Binary files a/src/assets/images/CFP/paper/paper@2x.png and b/src/assets/images/CFP/paper/paper@2x.png differ diff --git a/src/assets/scss/CFP/intro.scss b/src/assets/scss/CFP/intro.scss index 9e758dc..96ebe67 100644 --- a/src/assets/scss/CFP/intro.scss +++ b/src/assets/scss/CFP/intro.scss @@ -42,6 +42,17 @@ $fontColor: $mid-blue; overflow: hidden; padding-bottom: 0; } +@media screen and (max-width: 1021px) { + .introduction { + height: 2230px; + } +} +@media screen and (max-width: 891px) { + .introduction { + height: 2200px; + } +} + // Utiliy #cfp-intro { @@ -178,7 +189,7 @@ $fontColor: $mid-blue; align-items: flex-end; } } - + .give-me-money { position: relative; z-index: 2; @@ -263,6 +274,7 @@ $fontColor: $mid-blue; } @include sm { + #cfp-intro{ h1, h2, @@ -326,8 +338,7 @@ $fontColor: $mid-blue; #cfp-intro{ .box-back2 { - margin-top:-4em; - + margin-top:-2em; .second-box { transform: rotate(12deg); bottom: 1200px; diff --git a/src/components/news/Agenda.vue b/src/components/news/Agenda.vue index e038e1c..2d64df9 100644 --- a/src/components/news/Agenda.vue +++ b/src/components/news/Agenda.vue @@ -231,42 +231,42 @@ export default class Agenda extends Vue { { Q: '先備知識與目標受眾有何不同?', A: - '「目標受眾」表示您預期何種人將會前來參與該場議程,此欄位可能表示為與會者的興趣、生活環境抑或年齡層。「先備知識」表示對該議程有興趣者,您建議須先備哪些基礎技術、能力或經驗,有助於了解與吸收該場議程的知識精華。舉例而言,若一講題為「在營隊中使用虛擬貨幣」,則先備知識可能是「沒有」,目標受眾可能是「有想要辦營隊的人」。而如果是有關Julia 程式語言的演講,則先備知識可能是「知道平行運算是什麼」,目標受眾可能是「想用 Julia 做資料科學的人」。', - // v: false + '「目標受眾」表示您預期何種人將會前來參與該場議程,此欄位可能表示為與會者的興趣、生活環境抑或年齡層。「先備知識」表示對該議程有興趣者,您建議須先備哪些基礎技術、能力或經驗,有助於了解與吸收該場議程的知識精華。舉例而言,若一講題為「在營隊中使用虛擬貨幣」,則先備知識可能是「沒有」,目標受眾可能是「有想要辦營隊的人」。而如果是有關Julia 程式語言的演講,則先備知識可能是「知道平行運算是什麼」,目標受眾可能是「想用 Julia 做資料科學的人」。' + // v: fals }, { Q: '投稿主題是否有必要切合年會主題(算盤的後裔)?', A: - '不用。審稿時僅會依照上文所述方式審查,不會因為切合主題就拿到比較高分,或因為與 主題無關就被扣分。', + '不用。審稿時僅會依照上文所述方式審查,不會因為切合主題就拿到比較高分,或因為與 主題無關就被扣分。' // v: false }, { Q: '先備知識與目標受眾有何不同?', A: - '若我們認為您的稿件很優秀,但可能比較適合另一種形式,或者該形式的名額已經額滿、無法再增額時,我們會向您充分說明與溝通,並經您的同意後,轉換稿件類型。', + '若我們認為您的稿件很優秀,但可能比較適合另一種形式,或者該形式的名額已經額滿、無法再增額時,我們會向您充分說明與溝通,並經您的同意後,轉換稿件類型。' // v: false }, { Q: '如果我的稿件預計會有多個講者,投稿時需要注意什麼?', A: - '請在「暱稱/名字」欄位標示所有講者的稱呼,並在「演講大綱」詳細說明各個講者如何分配演講內容。稿件經接受者,無論講者人數,皆只提供一組可轉贈的入場票邀請碼、一張講者識別證、一份午餐餐盒與一份講者專屬迎賓禮。未佩戴識別證的講者,僅能在自己的演講時,於該議程時段進入議程所在的會議廳。', + '請在「暱稱/名字」欄位標示所有講者的稱呼,並在「演講大綱」詳細說明各個講者如何分配演講內容。稿件經接受者,無論講者人數,皆只提供一組可轉贈的入場票邀請碼、一張講者識別證、一份午餐餐盒與一份講者專屬迎賓禮。未佩戴識別證的講者,僅能在自己的演講時,於該議程時段進入議程所在的會議廳。' // v: false }, { Q: '如果我入選第二階段,可以提供哪些補充資料?', A: - '您可以提供簡報檔案、講稿、演講錄音搭配簡報畫面製成影片,或是實際錄影,您可以自行決定是否提供上述的任何一項,作為補充資料。', + '您可以提供簡報檔案、講稿、演講錄音搭配簡報畫面製成影片,或是實際錄影,您可以自行決定是否提供上述的任何一項,作為補充資料。' // v: false }, { Q: '還有疑問怎麼辦?', A: - '歡迎來投稿者小聚與我們聊聊,或寄信至 session[at]sitcon.org 詢問,我們會儘速回應。', + '歡迎來投稿者小聚與我們聊聊,或寄信至 session[at]sitcon.org 詢問,我們會儘速回應。' // v: false } ]; -//I am already using checkbox in CSS with better approach and SEO, we don't need to use JS in there. -//I am comment all relative js for js approach. +// I am already using checkbox in CSS with better approach and SEO, we don't need to use JS in there. +// I am comment all relative js for js approach. // private fade = (index: number) => { // this.QA[index].v = !this.QA[index].v; // } diff --git a/src/pages/News.vue b/src/pages/News.vue index 50f6633..5f7bb08 100644 --- a/src/pages/News.vue +++ b/src/pages/News.vue @@ -8,17 +8,17 @@