From b6ca052dae4911627e53bf069ee3c7190e9308ec Mon Sep 17 00:00:00 2001 From: yeonjulee1005 Date: Mon, 15 Jan 2024 23:35:45 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=9A=93=20develop=20(dewdew)=20version?= =?UTF-8?q?:=202.3.0=20-=20=EB=A9=94=EC=9D=B8=20>=20Tech=20=EB=AF=B8?= =?UTF-8?q?=EB=A6=AC=EB=B3=B4=EA=B8=B0=20Flicking=20=EA=B5=AC=ED=98=84=20-?= =?UTF-8?q?=20=EB=A9=94=EC=9D=B8=20>=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20activate=20=EB=8F=99=EC=9E=91=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A1=A4=ED=8F=AC=EC=A7=80=EC=85=98=20=EC=88=98=EC=A0=95=20-?= =?UTF-8?q?=20Tech=20>=20=EB=8C=93=EA=B8=80=20=EC=82=AD=EC=A0=9C=EB=B6=88?= =?UTF-8?q?=EA=B0=80=20=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95=20-=20Portf?= =?UTF-8?q?olio=20>=20=EC=B2=98=EC=9D=8C=20=EC=84=A0=ED=83=9D=20=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EB=AF=B8=ED=91=9C=EC=8B=9C=20=EB=B2=84?= =?UTF-8?q?=EA=B7=B8=EC=88=98=EC=A0=95=20-=20defineModel()=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=EC=B2=98=EB=A6=AC=20-=20=EA=B0=81=20=EB=94=94?= =?UTF-8?q?=EC=9E=90=EC=9D=B8=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=A1=B0?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/desktop/components/main_contact.scss | 2 +- .../scss/desktop/components/main_resume.scss | 9 ++- .../scss/mobile/components/main_contact.scss | 3 +- .../scss/mobile/components/main_resume.scss | 9 ++- assets/scss/mobile/pages/tech_detail.scss | 1 + assets/scss/mobile/pages/tech_list.scss | 1 + .../components/archive_main_slider.scss | 11 +++- .../shared/components/content_container.scss | 2 +- .../scss/shared/components/main_contact.scss | 6 +- .../shared/components/main_prev_tech.scss | 25 +++++++ .../scss/shared/components/main_skills.scss | 2 +- assets/scss/shared/pages/portfolio.scss | 11 +++- assets/scss/shared/pages/tech_detail.scss | 2 +- assets/scss/shared/pages/tech_list.scss | 9 ++- assets/scss/shared/share_combine.scss | 1 + .../scss/tablet/components/main_contact.scss | 5 +- .../scss/tablet/components/main_resume.scss | 9 ++- components/A/Accordion.vue | 2 +- components/A/Header.vue | 2 +- components/Footer/Information.vue | 2 +- components/Main/Contact.vue | 12 ++-- components/Main/IntroBanner.vue | 19 +++--- components/Main/Portfolio.vue | 18 ++--- components/Main/PrevTech.vue | 65 ++++++++++++++++++ components/Main/Resume.vue | 26 ++++---- components/Main/ScrollDown.vue | 12 ++-- components/Main/Skills/Contents.vue | 32 ++++----- components/Main/Skills/Descriptions.vue | 12 ++-- components/Main/Skills/Image.vue | 18 ++--- components/Main/Skills/Progress.vue | 12 +--- components/Tech/CardComponent.vue | 5 +- components/Tech/Comments.vue | 4 +- components/Tech/CreateComment.vue | 25 ++----- components/Tiptap/Editor.vue | 6 +- components/dialog/Archive.vue | 17 +++-- components/dialog/CreateArticle.vue | 12 ++-- components/dialog/HyperLink.vue | 12 ++-- components/dialog/ImageUpload.vue | 12 ++-- components/dialog/MagicLink.vue | 13 ++-- components/dialog/PasswordCheck.vue | 12 ++-- components/dialog/YoutubeLink.vue | 12 ++-- composables/fetch/index.ts | 29 +++++++- locales/en.ts | 19 ++++-- locales/ko.ts | 19 ++++-- pages/archives/[year].vue | 2 +- pages/main.vue | 63 ++++++++++-------- pages/portfolio.vue | 66 ++++++++++--------- pages/tech/index.vue | 2 +- types/global.d.ts | 23 +++++++ 49 files changed, 416 insertions(+), 277 deletions(-) create mode 100644 assets/scss/shared/components/main_prev_tech.scss create mode 100644 components/Main/PrevTech.vue diff --git a/assets/scss/desktop/components/main_contact.scss b/assets/scss/desktop/components/main_contact.scss index 2a423a0..4290e50 100644 --- a/assets/scss/desktop/components/main_contact.scss +++ b/assets/scss/desktop/components/main_contact.scss @@ -9,7 +9,7 @@ width: $space-800; .email { .email-form { - width: $space-300; + width: calc($space-300 + $space-60); } } } diff --git a/assets/scss/desktop/components/main_resume.scss b/assets/scss/desktop/components/main_resume.scss index 40971fd..77ad82b 100644 --- a/assets/scss/desktop/components/main_resume.scss +++ b/assets/scss/desktop/components/main_resume.scss @@ -5,10 +5,15 @@ * * Desktop * */ .main-resume { - margin: calc($space-200 + $space-40) auto $space-200; + margin: calc($space-100 + $space-20) auto $space-200; .resume-container { .resume-title { - @include headline1; + @include headline5; + text-align: center; + &:last-child { + @include headline6; + text-align: center; + } } .educate-group, .career-group { diff --git a/assets/scss/mobile/components/main_contact.scss b/assets/scss/mobile/components/main_contact.scss index 1c99839..d95b129 100644 --- a/assets/scss/mobile/components/main_contact.scss +++ b/assets/scss/mobile/components/main_contact.scss @@ -17,10 +17,9 @@ } } .email { - width: $space-90vw; margin-top: $space-40; .email-form { - width: $space-90vw; + width: $space-80vw; } } } diff --git a/assets/scss/mobile/components/main_resume.scss b/assets/scss/mobile/components/main_resume.scss index 2a446ae..0dcfc68 100644 --- a/assets/scss/mobile/components/main_resume.scss +++ b/assets/scss/mobile/components/main_resume.scss @@ -5,7 +5,7 @@ * * Mobile * */ .main-resume { - margin: $space-200 auto $space-200; + margin: $space-80 auto $space-200; .resume-container { flex-direction: column; align-items: center; @@ -17,7 +17,12 @@ margin: $space-20 auto; } .resume-title { - @include headline3; + @include headline5; + text-align: center; + &:last-child { + @include headline6; + text-align: center; + } } .accordion { padding: $space-20; diff --git a/assets/scss/mobile/pages/tech_detail.scss b/assets/scss/mobile/pages/tech_detail.scss index 33190ab..0e6fe6f 100644 --- a/assets/scss/mobile/pages/tech_detail.scss +++ b/assets/scss/mobile/pages/tech_detail.scss @@ -7,6 +7,7 @@ */ .tech-article { .article-header { + margin-top: $space-100; flex-direction: column; align-items: flex-start; .time { diff --git a/assets/scss/mobile/pages/tech_list.scss b/assets/scss/mobile/pages/tech_list.scss index 761b246..220361a 100644 --- a/assets/scss/mobile/pages/tech_list.scss +++ b/assets/scss/mobile/pages/tech_list.scss @@ -7,6 +7,7 @@ */ .tech-lists { .write-button-container { + margin-top: $space-100; margin-left: unset; } .tech-card { diff --git a/assets/scss/shared/components/archive_main_slider.scss b/assets/scss/shared/components/archive_main_slider.scss index 860636e..7ccaf41 100644 --- a/assets/scss/shared/components/archive_main_slider.scss +++ b/assets/scss/shared/components/archive_main_slider.scss @@ -14,7 +14,7 @@ .prev-button { position: relative; - top: calc($space-100 + $space-20); + top: $space-160; left: $space-10vw; z-index: 10; } @@ -74,5 +74,14 @@ align-self: flex-end; } } + &:hover { + .text-group { + .title, + .subtitle { + color: var(--d-red-color); + transition: color .3s; + } + } + } } } \ No newline at end of file diff --git a/assets/scss/shared/components/content_container.scss b/assets/scss/shared/components/content_container.scss index df727bc..5bf0399 100644 --- a/assets/scss/shared/components/content_container.scss +++ b/assets/scss/shared/components/content_container.scss @@ -8,7 +8,7 @@ max-width: $space-1000; width: $space-90vw; margin: 0 auto; - padding: $space-100 $space-20; + padding: $space-160 $space-20; .time { @include headline5; diff --git a/assets/scss/shared/components/main_contact.scss b/assets/scss/shared/components/main_contact.scss index 13c02ab..f9858b2 100644 --- a/assets/scss/shared/components/main_contact.scss +++ b/assets/scss/shared/components/main_contact.scss @@ -25,18 +25,14 @@ .kakao-button, .linkedin-button, .instagram-button { - width: $space-percent-100; + width: $space-percent-80; } } .email { - width: $space-percent-50; .email-title { @include headline3; color: var(--d-blue-color); } - .email-form { - width: $space-300; - } } } &.activate { diff --git a/assets/scss/shared/components/main_prev_tech.scss b/assets/scss/shared/components/main_prev_tech.scss new file mode 100644 index 0000000..bdd8404 --- /dev/null +++ b/assets/scss/shared/components/main_prev_tech.scss @@ -0,0 +1,25 @@ +@use '../../variables' as *; + +/** +* ! Main Prev Tech Style ! +* * Shared * +*/ +.main-prev-tech { + margin-top: $space-400; + opacity: 0; + transition: opacity .75s; + .title { + @include headline1; + } + .prev-card { + @include headline5; + cursor: pointer; + &:hover { + color: var(--d-red-color); + transition: color .3s; + } + } + &.activate { + opacity: 1; + } +} diff --git a/assets/scss/shared/components/main_skills.scss b/assets/scss/shared/components/main_skills.scss index c8f4cf9..a692e12 100644 --- a/assets/scss/shared/components/main_skills.scss +++ b/assets/scss/shared/components/main_skills.scss @@ -274,7 +274,7 @@ position: relative; height: fit-content; z-index: 9; - transition: opacity .9s, all .3s; + transition: opacity .75s, all .3s; opacity: 0; &.activate { opacity: 1; diff --git a/assets/scss/shared/pages/portfolio.scss b/assets/scss/shared/pages/portfolio.scss index 63c693b..08536a1 100644 --- a/assets/scss/shared/pages/portfolio.scss +++ b/assets/scss/shared/pages/portfolio.scss @@ -10,7 +10,7 @@ max-width: $space-1000; width: $space-80vw; margin: 0 auto; - padding: calc($space-100 + $space-20) $space-8 $space-40; + padding: calc($space-100 + $space-60) $space-8 $space-40; overflow: clip; .flicking-viewport { margin-bottom: $space-30; @@ -41,7 +41,14 @@ .card-description { @include headline6; } - .card-image { + .portfolio-card { cursor: pointer; + &:hover { + .card-title, + .card-description { + color: var(--d-red-color); + transition: color .3s + } + } } } \ No newline at end of file diff --git a/assets/scss/shared/pages/tech_detail.scss b/assets/scss/shared/pages/tech_detail.scss index 2d7295c..097d695 100644 --- a/assets/scss/shared/pages/tech_detail.scss +++ b/assets/scss/shared/pages/tech_detail.scss @@ -13,7 +13,7 @@ .article-header { width: $space-80vw; max-width: $space-1000; - margin-top: calc($space-100 + $space-20); + margin-top: $space-160; .title { @include headline3; align-self: flex-start; diff --git a/assets/scss/shared/pages/tech_list.scss b/assets/scss/shared/pages/tech_list.scss index 42e7f88..9f6e564 100644 --- a/assets/scss/shared/pages/tech_list.scss +++ b/assets/scss/shared/pages/tech_list.scss @@ -12,7 +12,7 @@ .write-button-container { width: $space-80vw; max-width: $space-1000; - margin-top: $space-100; + margin-top: $space-160; overflow-y: clip; } .tech-card { @@ -20,6 +20,13 @@ width: $space-80vw; max-width: $space-1000; cursor: pointer; + &:hover { + .title, + .desc { + color: var(--d-red-color); + transition: color .3s; + } + } .title { @include headline4; } diff --git a/assets/scss/shared/share_combine.scss b/assets/scss/shared/share_combine.scss index d012c54..69e8c1c 100644 --- a/assets/scss/shared/share_combine.scss +++ b/assets/scss/shared/share_combine.scss @@ -8,6 +8,7 @@ @forward './components/footer'; @forward './components/pwa'; @forward './components/main_intro_banner'; +@forward './components/main_prev_tech'; @forward './components/main_resume'; @forward './components/main_skills'; @forward './components/main_portfolio'; diff --git a/assets/scss/tablet/components/main_contact.scss b/assets/scss/tablet/components/main_contact.scss index 955dd2c..7edef40 100644 --- a/assets/scss/tablet/components/main_contact.scss +++ b/assets/scss/tablet/components/main_contact.scss @@ -10,14 +10,13 @@ align-items: center; width: $space-percent-100; .social { - width: $space-90vw; + width: $space-60vw; margin-bottom: $space-30; } .email { - width: $space-90vw; margin-top: $space-40; .email-form { - width: $space-300; + width: $space-50vw; } } } diff --git a/assets/scss/tablet/components/main_resume.scss b/assets/scss/tablet/components/main_resume.scss index 89488e1..6527a5e 100644 --- a/assets/scss/tablet/components/main_resume.scss +++ b/assets/scss/tablet/components/main_resume.scss @@ -5,7 +5,7 @@ * * Tablet * */ .main-resume { - margin: calc($space-200 + $space-20) auto $space-200; + margin: $space-100 auto $space-200; .resume-container { flex-direction: column; align-items: center; @@ -16,7 +16,12 @@ margin: $space-20 auto; } .resume-title { - @include headline2; + @include headline3; + text-align: center; + &:last-child { + @include headline5; + text-align: center; + } } .accordion { padding: $space-30; diff --git a/components/A/Accordion.vue b/components/A/Accordion.vue index 892b7fe..8383ddb 100644 --- a/components/A/Accordion.vue +++ b/components/A/Accordion.vue @@ -1,6 +1,6 @@