From e113ebd4e7389474a79d6105f5c9c17a279fba67 Mon Sep 17 00:00:00 2001 From: Takusea Date: Mon, 8 Jul 2024 19:16:53 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=E6=8B=A1=E5=BC=B5=E5=AD=90=E3=82=92.spec.t?= =?UTF-8?q?s=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...HelpMarkdownViewSection.ts => HelpMarkdownViewSection.spec.ts} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tests/unit/components/help/{HelpMarkdownViewSection.ts => HelpMarkdownViewSection.spec.ts} (100%) diff --git a/tests/unit/components/help/HelpMarkdownViewSection.ts b/tests/unit/components/help/HelpMarkdownViewSection.spec.ts similarity index 100% rename from tests/unit/components/help/HelpMarkdownViewSection.ts rename to tests/unit/components/help/HelpMarkdownViewSection.spec.ts From 91023f5799f48e6a20768989fdbdb0393514a751 Mon Sep 17 00:00:00 2001 From: Takusea Date: Mon, 8 Jul 2024 19:17:17 +0900 Subject: [PATCH 2/7] =?UTF-8?q?summary=E8=A6=81=E7=B4=A0=E3=81=AE=E3=82=B9?= =?UTF-8?q?=E3=82=BF=E3=82=A4=E3=83=AB=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/ImportSongProjectDialog.vue | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/components/Dialog/ImportSongProjectDialog.vue b/src/components/Dialog/ImportSongProjectDialog.vue index 70cb072a58..8bc528f960 100644 --- a/src/components/Dialog/ImportSongProjectDialog.vue +++ b/src/components/Dialog/ImportSongProjectDialog.vue @@ -301,3 +301,13 @@ const handleCancel = () => { onDialogCancel(); }; + + From b3749f2971b95e524f5d43252051c77c2e19a9c6 Mon Sep 17 00:00:00 2001 From: Takusea Date: Mon, 8 Jul 2024 19:17:47 +0900 Subject: [PATCH 3/7] =?UTF-8?q?display,display-on-color=E3=81=ABlighten?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/colors-v2.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/colors-v2.scss b/src/styles/colors-v2.scss index 34561a7146..0be6e9fc8c 100644 --- a/src/styles/colors-v2.scss +++ b/src/styles/colors-v2.scss @@ -17,8 +17,8 @@ $primitive-red: #d04756; --color-v2-border: #{rgba($primitive-black, 0.2)}; --color-v2-selected: #{rgba($primitive-primary, 0.3)}; - --color-v2-display: #{$primitive-black, 10%}; - --color-v2-display-oncolor: #{$primitive-black, 10%}; + --color-v2-display: #{lighten($primitive-black, 10%)}; + --color-v2-display-oncolor: #{lighten($primitive-black, 10%)}; --color-v2-display-sub: #{rgba($primitive-black, 0.5)}; --color-v2-display-link: #{$primitive-blue}; --color-v2-display-warning: #{$primitive-red}; From 005fde4dbf85aff1e0a43212cf9f8d69e03534dc Mon Sep 17 00:00:00 2001 From: Takusea Date: Mon, 8 Jul 2024 21:19:49 +0900 Subject: [PATCH 4/7] =?UTF-8?q?SCSS=E5=A4=89=E6=95=B0=E3=82=92=E7=94=A8?= =?UTF-8?q?=E3=81=84=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dialog/HelpDialog/HelpDialog.vue | 4 ++-- .../Dialog/HelpDialog/HelpUpdateInfoSection.vue | 12 +++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/components/Dialog/HelpDialog/HelpDialog.vue b/src/components/Dialog/HelpDialog/HelpDialog.vue index 9935c5d11a..760a42ff80 100644 --- a/src/components/Dialog/HelpDialog/HelpDialog.vue +++ b/src/components/Dialog/HelpDialog/HelpDialog.vue @@ -308,8 +308,8 @@ const openLogDirectory = window.backend.openLogDirectory; } .list-label { - padding: 8px 16px; - padding-top: 16px; + padding: vars.$padding-2; + padding-bottom: vars.$padding-1; color: colors.$display-sub; } diff --git a/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue b/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue index e0f6a62087..daa73762b3 100644 --- a/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue +++ b/src/components/Dialog/HelpDialog/HelpUpdateInfoSection.vue @@ -75,15 +75,13 @@ const props = defineProps<{ } .info { - background-color: #e9f3e7; - padding: 16px; - border-radius: 16px; + border: 1px solid colors.$border; + background-color: colors.$surface; + padding: vars.$padding-2; + border-radius: vars.$radius-2; } .info-title { - font-size: 1.25rem; - font-weight: bold; - line-height: 2; - margin: 0; + @include mixin.headline-2; } From 2665b050b7ddb348a950c311ff8b41ecf09c548f Mon Sep 17 00:00:00 2001 From: Takusea Date: Tue, 9 Jul 2024 18:56:48 +0900 Subject: [PATCH 5/7] =?UTF-8?q?HelpDialog=E3=82=B3=E3=83=B3=E3=83=9D?= =?UTF-8?q?=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E3=81=AE=E3=83=91=E3=82=B9?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/unit/components/help/HelpMarkdownViewSection.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/components/help/HelpMarkdownViewSection.spec.ts b/tests/unit/components/help/HelpMarkdownViewSection.spec.ts index 4f38f080fe..2e6a024e0e 100644 --- a/tests/unit/components/help/HelpMarkdownViewSection.spec.ts +++ b/tests/unit/components/help/HelpMarkdownViewSection.spec.ts @@ -1,6 +1,6 @@ import { mount, flushPromises } from "@vue/test-utils"; import { describe, it } from "vitest"; -import HelpMarkdownViewSection from "@/components/template/HelpMarkdownViewSection.vue"; +import HelpMarkdownViewSection from "@/components/Dialog/HelpDialog/HelpMarkdownViewSection.vue"; import { markdownItPlugin } from "@/plugins/markdownItPlugin"; describe("HelpMarkdownViewSection.vue", () => { From 99d51d5b89ab90afea1d8b87bfeee7406933a3b0 Mon Sep 17 00:00:00 2001 From: Takusea Date: Sat, 20 Jul 2024 02:14:22 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=E6=96=B0=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=A7=E7=94=A8=E3=81=84=E3=82=8Bscss=E3=83=95?= =?UTF-8?q?=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=AE=E3=83=91=E3=82=B9=E3=82=92?= =?UTF-8?q?styles/v2=E4=B8=8B=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Base/BaseButton.vue | 6 ++--- src/components/Base/BaseDocumentView.vue | 6 ++--- src/components/Base/BaseListItem.vue | 6 ++--- src/components/Base/BaseRowCard.vue | 6 ++--- src/components/Base/BaseScrollArea.vue | 4 +-- .../Dialog/HelpDialog/HelpDialog.vue | 4 +-- .../HelpDialog/HelpLibraryPolicySection.vue | 6 ++--- .../HelpDialog/HelpMarkdownViewSection.vue | 4 +-- .../HelpDialog/HelpOssLicenseSection.vue | 6 ++--- .../HelpDialog/HelpUpdateInfoSection.vue | 6 ++--- src/styles/_index.scss | 4 ++- src/styles/{colors-v2.scss => v2/colors.scss} | 0 src/styles/{ => v2}/mixin.scss | 0 src/styles/v2/variables.scss | 24 ++++++++++++++++++ src/styles/variables.scss | 25 ------------------- 15 files changed, 54 insertions(+), 53 deletions(-) rename src/styles/{colors-v2.scss => v2/colors.scss} (100%) rename src/styles/{ => v2}/mixin.scss (100%) create mode 100644 src/styles/v2/variables.scss diff --git a/src/components/Base/BaseButton.vue b/src/components/Base/BaseButton.vue index 401f3c91ac..fd7a09e501 100644 --- a/src/components/Base/BaseButton.vue +++ b/src/components/Base/BaseButton.vue @@ -23,9 +23,9 @@ defineEmits<{