From 979b5067f3b7f68584f27d11756cf84ab8653793 Mon Sep 17 00:00:00 2001 From: takusea Date: Wed, 15 Nov 2023 22:25:18 +0900 Subject: [PATCH 01/17] =?UTF-8?q?=E3=83=99=E3=83=BC=E3=82=B9=E3=82=B3?= =?UTF-8?q?=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E3=82=92?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseButton.vue | 86 +++++++++++++++++++++++++++++ src/components/base/BaseRowCard.vue | 64 +++++++++++++++++++++ 2 files changed, 150 insertions(+) create mode 100644 src/components/base/BaseButton.vue create mode 100644 src/components/base/BaseRowCard.vue diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue new file mode 100644 index 0000000000..f8bdf89182 --- /dev/null +++ b/src/components/base/BaseButton.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/components/base/BaseRowCard.vue b/src/components/base/BaseRowCard.vue new file mode 100644 index 0000000000..20dd3eef09 --- /dev/null +++ b/src/components/base/BaseRowCard.vue @@ -0,0 +1,64 @@ + + + + + From 7bb6d24671423abb9bd936930d828d590f7f81d1 Mon Sep 17 00:00:00 2001 From: takusea Date: Wed, 15 Nov 2023 22:36:33 +0900 Subject: [PATCH 02/17] =?UTF-8?q?scss=E5=A4=89=E6=95=B0=E3=81=AE=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/variables.scss | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 4587008156..4b2fe3351b 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -6,3 +6,22 @@ $menubar-height: 24px; $detail-view-splitter-cell-z-index: 2; $character-item-size: 215px; // キャラクター並び替えダイアログなどでの1キャラ表示要素の横幅 + +$size-scrollbar: 8px; +$size-icon: 16px; +$size-indicator: 24px; +$size-control: 32px; +$size-listitem: 40px; +$size-fab: 48px; + +$padding-control: 8px; +$padding-button: 16px; +$padding-container: 16px; + +$gap-control: 8px; +$gap-container: 16px; + +$radius-control: 8px; +$radius-container: 16px; + +$transition-duration: 100ms; From e6a87488cc4cfadc054ea28bbe35dd469d918c2c Mon Sep 17 00:00:00 2001 From: takusea Date: Wed, 15 Nov 2023 23:12:35 +0900 Subject: [PATCH 03/17] =?UTF-8?q?=E3=83=AA=E3=83=87=E3=82=B6=E3=82=A4?= =?UTF-8?q?=E3=83=B3=E3=81=97=E3=81=9F=E3=83=A9=E3=82=A4=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E6=83=85=E5=A0=B1=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=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/template/OssLicenseSection.vue | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 src/components/template/OssLicenseSection.vue diff --git a/src/components/template/OssLicenseSection.vue b/src/components/template/OssLicenseSection.vue new file mode 100644 index 0000000000..ff9d25a786 --- /dev/null +++ b/src/components/template/OssLicenseSection.vue @@ -0,0 +1,85 @@ + + + + + From 26b53c44612e5c843ce6d33d5ea3640965b004ee Mon Sep 17 00:00:00 2001 From: takusea Date: Wed, 15 Nov 2023 23:14:54 +0900 Subject: [PATCH 04/17] =?UTF-8?q?=E3=82=A4=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=88=E3=81=99=E3=82=8B=E3=83=A9=E3=82=A4=E3=82=BB=E3=83=B3?= =?UTF-8?q?=E3=82=B9=E6=83=85=E5=A0=B1=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC?= =?UTF-8?q?=E3=83=8D=E3=83=B3=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/help/HelpDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/help/HelpDialog.vue b/src/components/help/HelpDialog.vue index 653d9c8234..205b43b4b4 100644 --- a/src/components/help/HelpDialog.vue +++ b/src/components/help/HelpDialog.vue @@ -86,10 +86,10 @@ + + diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 4b2fe3351b..b84a77dece 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -7,7 +7,7 @@ $detail-view-splitter-cell-z-index: 2; $character-item-size: 215px; // キャラクター並び替えダイアログなどでの1キャラ表示要素の横幅 -$size-scrollbar: 8px; +$size-scrollbar: 12px; $size-icon: 16px; $size-indicator: 24px; $size-control: 32px; From f0d146cfb5766083e2d544f3f78ee0531463918f Mon Sep 17 00:00:00 2001 From: takusea Date: Sun, 3 Dec 2023 19:04:16 +0900 Subject: [PATCH 09/17] =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=AD=E3=83=BC?= =?UTF-8?q?=E3=83=AB=E3=81=ABBaseScrollArea=E3=82=92=E7=94=A8=E3=81=84?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/template/OssLicenseSection.vue | 57 ++++++++++--------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/src/components/template/OssLicenseSection.vue b/src/components/template/OssLicenseSection.vue index ff9d25a786..f566ecc281 100644 --- a/src/components/template/OssLicenseSection.vue +++ b/src/components/template/OssLicenseSection.vue @@ -1,32 +1,36 @@ @@ -34,6 +38,7 @@ import { ref } from "vue"; import BaseRowCard from "../base/BaseRowCard.vue"; import BaseButton from "../base/BaseButton.vue"; +import BaseScrollArea from "../base/BaseScrollArea.vue"; const props = defineProps<{ @@ -55,7 +60,6 @@ const selectLicenseIndex = (index: number | undefined) => { // 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する // height: 100%; height: calc(100vh - 90px); - overflow-y: auto; background-color: #e9f3e7; } @@ -64,7 +68,6 @@ const selectLicenseIndex = (index: number | undefined) => { flex-direction: column; padding: vars.$padding-container; gap: vars.$gap-container; - min-height: 100%; } .inner-detail { From 12db4d329cf71ae769d2cd7205e13128b54d785b Mon Sep 17 00:00:00 2001 From: takusea Date: Sun, 3 Dec 2023 19:04:23 +0900 Subject: [PATCH 10/17] =?UTF-8?q?Headline=E7=94=A8=E3=82=B9=E3=82=BF?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=82=92typography=E3=83=95=E3=82=A1?= =?UTF-8?q?=E3=82=A4=E3=83=AB=E3=81=AEheadline-1=20Mixin=E3=81=AB=E7=A7=BB?= =?UTF-8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/template/OssLicenseSection.vue | 7 +++---- src/styles/typography.scss | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-) create mode 100644 src/styles/typography.scss diff --git a/src/components/template/OssLicenseSection.vue b/src/components/template/OssLicenseSection.vue index f566ecc281..e16868c1b6 100644 --- a/src/components/template/OssLicenseSection.vue +++ b/src/components/template/OssLicenseSection.vue @@ -55,6 +55,7 @@ const selectLicenseIndex = (index: number | undefined) => { From 938a5b7921caf39757b245bc0d8724b1bf638f8e Mon Sep 17 00:00:00 2001 From: takusea Date: Wed, 13 Dec 2023 21:32:47 +0900 Subject: [PATCH 14/17] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?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/components/base/BaseButton.vue | 1 + src/components/template/OssLicenseSection.vue | 3 ++- src/styles/mixin.scss | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue index 2fb546d0ef..0356b1dacd 100644 --- a/src/components/base/BaseButton.vue +++ b/src/components/base/BaseButton.vue @@ -4,6 +4,7 @@ :class="variant ? variant : 'default'" @click="(payload) => $emit('click', payload)" > + {{ label }} diff --git a/src/components/template/OssLicenseSection.vue b/src/components/template/OssLicenseSection.vue index 6f405c0ba4..66b91b4674 100644 --- a/src/components/template/OssLicenseSection.vue +++ b/src/components/template/OssLicenseSection.vue @@ -13,6 +13,7 @@ clickable @click="selectLicenseIndex(index)" > + @@ -60,7 +61,7 @@ const selectLicenseIndex = (index: number | undefined) => { @use '@/styles/mixin' as mixin; .container { - // 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する + // TODO: 親コンポーネントからheightを取得できないため一時的にcalcを使用、HelpDialogの構造を再設計後100%に変更する // height: 100%; height: calc(100vh - 90px); background-color: #e9f3e7; diff --git a/src/styles/mixin.scss b/src/styles/mixin.scss index 654b21669a..d3e528a73c 100644 --- a/src/styles/mixin.scss +++ b/src/styles/mixin.scss @@ -1,8 +1,10 @@ +// キーボードフォーカス時のOutline表示用のスタイル @mixin on-focus { outline-color: #a5d4ad; outline-width: 2px; } +// 見出し1(h1)用のスタイル @mixin headline-1 { font-size: 1.5rem; line-height: 2; From d8bc2b75845629601b86fc598e43c169ee71a922 Mon Sep 17 00:00:00 2001 From: takusea Date: Wed, 13 Dec 2023 21:33:15 +0900 Subject: [PATCH 15/17] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E6=97=A7?= =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/help/OssLicense.vue | 64 ------------------------------ 1 file changed, 64 deletions(-) delete mode 100644 src/components/help/OssLicense.vue diff --git a/src/components/help/OssLicense.vue b/src/components/help/OssLicense.vue deleted file mode 100644 index 1b0ccd4354..0000000000 --- a/src/components/help/OssLicense.vue +++ /dev/null @@ -1,64 +0,0 @@ - - - - - From 1ca66766c9448e09bbf1ab5d4e6cca6e1ad8037e Mon Sep 17 00:00:00 2001 From: takusea Date: Sat, 16 Dec 2023 10:44:46 +0900 Subject: [PATCH 16/17] =?UTF-8?q?Sass=E5=A4=89=E6=95=B0=E5=90=8D=E3=82=92?= =?UTF-8?q?=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/BaseRowCard.vue | 6 +-- src/components/template/OssLicenseSection.vue | 6 +-- src/styles/variables.scss | 38 +++++++++++-------- 4 files changed, 31 insertions(+), 25 deletions(-) diff --git a/src/components/base/BaseButton.vue b/src/components/base/BaseButton.vue index 0356b1dacd..e8c50de4da 100644 --- a/src/components/base/BaseButton.vue +++ b/src/components/base/BaseButton.vue @@ -31,9 +31,9 @@ defineEmits<{ justify-content: space-between; align-items: center; height: vars.$size-control; - border-radius: vars.$radius-control; - padding: 0 vars.$padding-button; - gap: vars.$gap-control; + border-radius: vars.$radius-1; + padding: 0 vars.$padding-2; + gap: vars.$gap-1; border: 1px solid; transition: background-color vars.$transition-duration; cursor: pointer; diff --git a/src/components/base/BaseRowCard.vue b/src/components/base/BaseRowCard.vue index c057871711..60504680cc 100644 --- a/src/components/base/BaseRowCard.vue +++ b/src/components/base/BaseRowCard.vue @@ -37,9 +37,9 @@ defineEmits<{ align-items: center; border: 1px solid #0002; background-color: #fff; - border-radius: vars.$radius-container; - padding: vars.$padding-container; - gap: vars.$gap-container; + border-radius: vars.$radius-2; + padding: vars.$padding-2; + gap: vars.$gap-2; transition: background-color vars.$transition-duration; } diff --git a/src/components/template/OssLicenseSection.vue b/src/components/template/OssLicenseSection.vue index 66b91b4674..e848643289 100644 --- a/src/components/template/OssLicenseSection.vue +++ b/src/components/template/OssLicenseSection.vue @@ -74,8 +74,8 @@ const selectLicenseIndex = (index: number | undefined) => { .inner { display: flex; flex-direction: column; - padding: vars.$padding-container; - gap: vars.$gap-container; + padding: vars.$padding-2; + gap: vars.$gap-1; } .title { @@ -85,6 +85,6 @@ const selectLicenseIndex = (index: number | undefined) => { .list { display: flex; flex-direction: column; - gap: vars.$gap-control; + gap: vars.$gap-1; } diff --git a/src/styles/variables.scss b/src/styles/variables.scss index b84a77dece..f58c77b62f 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -7,21 +7,27 @@ $detail-view-splitter-cell-z-index: 2; $character-item-size: 215px; // キャラクター並び替えダイアログなどでの1キャラ表示要素の横幅 -$size-scrollbar: 12px; -$size-icon: 16px; -$size-indicator: 24px; -$size-control: 32px; -$size-listitem: 40px; -$size-fab: 48px; - -$padding-control: 8px; -$padding-button: 16px; -$padding-container: 16px; - -$gap-control: 8px; -$gap-container: 16px; - -$radius-control: 8px; -$radius-container: 16px; +:root { + --size-basis: 8px; + --padding-basis: 8px; + --gap-basis: 8px; + --radius-basis: 8px; +} + +$size-scrollbar: calc(var(--size-basis) * 1.5); +$size-icon: calc(var(--size-basis) * 2); +$size-indicator: calc(var(--size-basis) * 3); +$size-control: calc(var(--size-basis) * 4); +$size-listitem: calc(var(--size-basis) * 5); +$size-fab: calc(var(--size-basis) * 6); + +$padding-1: var(--padding-basis); +$padding-2: calc(var(--padding-basis) * 2); + +$gap-1: var(--gap-basis); +$gap-2: calc(var(--gap-basis) * 2); + +$radius-1: var(--radius-basis); +$radius-2: calc(var(--radius-basis) * 2); $transition-duration: 100ms; From 51ad385d07518000400a2d2d097e76450935c8f6 Mon Sep 17 00:00:00 2001 From: takusea Date: Sun, 17 Dec 2023 18:42:00 +0900 Subject: [PATCH 17/17] =?UTF-8?q?=E3=82=AF=E3=83=A9=E3=82=B9=E3=81=AE?= =?UTF-8?q?=E5=91=BD=E5=90=8D=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/base/BaseScrollArea.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/base/BaseScrollArea.vue b/src/components/base/BaseScrollArea.vue index c5814a0f91..626ae0dea9 100644 --- a/src/components/base/BaseScrollArea.vue +++ b/src/components/base/BaseScrollArea.vue @@ -4,13 +4,13 @@ - -
+ +
- -
+ +
@@ -54,11 +54,11 @@ import { height: vars.$size-scrollbar; } -.ScrollAreaThumbContainer { +.ScrollAreaThumb { padding: 4px; } -.ScrollAreaThumb { +.thumb { width: 100%; height: 100%; background-color: #0002; @@ -67,7 +67,7 @@ import { transition: background-color vars.$transition-duration; } -.ScrollAreaScrollbar:hover .ScrollAreaThumb { +.ScrollAreaScrollbar:hover .thumb { background-color: #0003; }