From d9e16e430cf3f1cac91fd7fa136f70a3b1aa9ff0 Mon Sep 17 00:00:00 2001 From: gunyu1019 Date: Fri, 16 Feb 2024 16:27:19 +0900 Subject: [PATCH 01/10] [Feat] Add ticket icon at ticket button --- src/components/TicketButton.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/components/TicketButton.vue b/src/components/TicketButton.vue index f1a007d..f610b19 100644 --- a/src/components/TicketButton.vue +++ b/src/components/TicketButton.vue @@ -1,6 +1,11 @@ + + From a5188fba63bad04044d09ce9663ad22c12c80f9c Mon Sep 17 00:00:00 2001 From: gunyu1019 Date: Fri, 16 Feb 2024 16:27:33 +0900 Subject: [PATCH 02/10] [Feat] Add 'position: fixed' at navbar --- src/components/NavbarHeader.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/components/NavbarHeader.vue b/src/components/NavbarHeader.vue index dc5a6b1..65159bd 100644 --- a/src/components/NavbarHeader.vue +++ b/src/components/NavbarHeader.vue @@ -25,6 +25,9 @@ $color-backgroun-navbar: rgba($color-white, 0.1); z-index: 10; width: 100%; + position: fixed; + top: 0; + backdrop-filter: blur(10px); background: $color-backgroun-navbar; } From 3dfdfc884b647046438b443fe8ea32536b1b5840 Mon Sep 17 00:00:00 2001 From: gunyu1019 Date: Fri, 16 Feb 2024 16:28:32 +0900 Subject: [PATCH 03/10] [Feat] In PC, integrate Information component into MainTitle component. --- src/App.vue | 2 - src/components/Information.vue | 70 ++++++++++++++++++++++++++++++++-- src/components/MainTitle.vue | 46 ++++++++++++++++++++-- 3 files changed, 110 insertions(+), 8 deletions(-) diff --git a/src/App.vue b/src/App.vue index 17b3a6f..e7e2e84 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,6 @@ @@ -15,6 +39,46 @@ import TicketButton from '@/components/TicketButton.vue' @import 'pretendard/dist/web/static/pretendard.css'; div.information { + display: flex; + flex-direction: column; + justify-content: center; + gap: 64px; + + span, a, h2 { + color: $color-text-200; + font-family: + 'Pretendard', + -apple-system, + BlinkMacSystemFont, + system-ui, + Roboto, + 'Helvetica Neue', + 'Segoe UI', + 'Apple SD Gothic Neo', + 'Noto Sans KR', + 'Malgun Gothic', + sans-serif; + font-style: normal; + line-height: normal; + text-decoration: none; + } + + h2 { + color: $color-text-100; + font-size: 48px; + font-weight: 700; + } + + span { + display: block; + color: $color-text-200; + font-size: 24px; + font-weight: 500; + letter-spacing: 0.48px; + } +} + +/* div.information { display: flex; flex-direction: column; align-items: center; @@ -55,5 +119,5 @@ div.information { color: $vt-c-white; font-size: 32px; } -} +} */ diff --git a/src/components/MainTitle.vue b/src/components/MainTitle.vue index f1bf4d8..11731a8 100644 --- a/src/components/MainTitle.vue +++ b/src/components/MainTitle.vue @@ -1,11 +1,20 @@ @@ -13,7 +22,38 @@ import Logo from '@/assets/image/GWDC24.png' @import '@/assets/color'; @import 'pretendard/dist/web/static/pretendard.css'; -div.main { +div.main-container { + display: flex; + justify-content: center; + align-items: center; + + z-index: 5; + height: 100vh; + + div.main { + @media screen and (min-width: 900px) { + display: flex; + justify-content: center; + align-items: end; + gap: 88px; + } + + div.logo { + width: 400px; + height: 499px; + + img.logo-image { + top: -219px; + left: -215px; + position: relative; + //transform: rotate(2.347deg); + //filter: drop-shadow(0.563px 0.563px 240px rgba(255, 255, 255, 0.32)) drop-shadow(18px 27px 128px rgba(136, 196, 240, 0.16)) drop-shadow(-24px -24px 128px rgba(255, 94, 94, 0.16)); + } + } + } +} + +/* div.main { display: flex; flex-direction: column; align-items: center; @@ -51,5 +91,5 @@ div.main { position: absolute; bottom: 0; } -} +} */ From efa135212f7686611792078ac3a8b5fc8d2e9074 Mon Sep 17 00:00:00 2001 From: gunyu1019 Date: Fri, 16 Feb 2024 18:31:56 +0900 Subject: [PATCH 04/10] [Feat] Add relative website --- src/assets/variable.scss | 6 ++++ src/components/BackgroundIcon.vue | 2 +- src/components/Information.vue | 6 ++++ src/components/MainTitle.vue | 52 +++++++++++++++++++++++-------- 4 files changed, 52 insertions(+), 14 deletions(-) create mode 100644 src/assets/variable.scss diff --git a/src/assets/variable.scss b/src/assets/variable.scss new file mode 100644 index 0000000..2dab88d --- /dev/null +++ b/src/assets/variable.scss @@ -0,0 +1,6 @@ +$breakpoint-mobile-to-pc: 980px; + +$image-original-size-width: 829px; +$image-original-size-height: 937px; +$image-cut-in-size-width: 400px; +$image-cut-in-size-height: 499px; \ No newline at end of file diff --git a/src/components/BackgroundIcon.vue b/src/components/BackgroundIcon.vue index 378fe3e..25cf527 100644 --- a/src/components/BackgroundIcon.vue +++ b/src/components/BackgroundIcon.vue @@ -12,7 +12,7 @@ const props = defineProps<{ const imageTarget: Ref = ref(null) const imageTargetCover: Ref = ref(null) const onResized = () => { - const pageWidth = window.innerWidth + const pageWidth = window.outerWidth const imageWidth: number | undefined = imageTarget.value?.clientWidth const finalWidth = props.left && imageWidth ? props.left + imageWidth - pageWidth : -1 // console.log(props.icon) diff --git a/src/components/Information.vue b/src/components/Information.vue index e898b9e..5dee69d 100644 --- a/src/components/Information.vue +++ b/src/components/Information.vue @@ -36,6 +36,7 @@ const conferenceInfo = { From e3016b4881853f6d11bd8cce63638023c1a43667 Mon Sep 17 00:00:00 2001 From: gunyu1019 Date: Fri, 16 Feb 2024 22:16:44 +0900 Subject: [PATCH 08/10] [Feat] Add onClick event to AnimatedArrowScroll --- src/components/Information.vue | 8 +++++++- src/components/MainTitle.vue | 37 +++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/src/components/Information.vue b/src/components/Information.vue index 5dee69d..f7611ad 100644 --- a/src/components/Information.vue +++ b/src/components/Information.vue @@ -1,5 +1,6 @@ diff --git a/src/components/Motive.vue b/src/components/Motive.vue index 96cd93a..f9f32af 100644 --- a/src/components/Motive.vue +++ b/src/components/Motive.vue @@ -49,7 +49,7 @@ div.motive { font-size: 24px; font-style: normal; font-weight: 600; - line-height: normal; + line-height: 30px; letter-spacing: -0.36px; } @@ -70,7 +70,7 @@ div.motive { font-size: 18px; font-style: normal; font-weight: 500; - line-height: 20px; /* 142.857% */ + line-height: 24px; /* 142.857% */ //letter-spacing: -0.28px; } } diff --git a/src/components/Speaker.vue b/src/components/Speaker.vue index fced34a..b107c55 100644 --- a/src/components/Speaker.vue +++ b/src/components/Speaker.vue @@ -49,6 +49,7 @@ const speakers: SpeakerItem[] = [