diff --git a/src/components/Base/BaseButton.vue b/src/components/Base/BaseButton.vue index 406e2b6794..a939575e7e 100644 --- a/src/components/Base/BaseButton.vue +++ b/src/components/Base/BaseButton.vue @@ -33,8 +33,7 @@ defineEmits<{ display: flex; justify-content: center; align-items: center; - text-wrap: nowrap; - height: vars.$size-control; + min-height: vars.$size-control; border-radius: vars.$radius-1; padding: 0 vars.$padding-2; gap: vars.$gap-1; diff --git a/src/components/Dialog/AllDialog.vue b/src/components/Dialog/AllDialog.vue index 1dbbca07da..61abdb3b9b 100644 --- a/src/components/Dialog/AllDialog.vue +++ b/src/components/Dialog/AllDialog.vue @@ -10,14 +10,19 @@ + store.state.isCharacterListDialogOpen, + set: (val) => + store.actions.SET_DIALOG_OPEN({ + isCharacterListDialogOpen: val, + }), +}); + // キャラクター並び替え const orderedAllCharacterInfos = computed( () => store.getters.GET_ORDERED_ALL_CHARACTER_INFOS, ); -const isCharacterOrderDialogOpenComputed = computed({ +const isOldCharacterOrderDialogOpenComputed = computed({ get: () => !store.state.isAcceptTermsDialogOpen && - store.state.isCharacterOrderDialogOpen, + store.state.isOldCharacterOrderDialogOpen, set: (val) => store.actions.SET_DIALOG_OPEN({ - isCharacterOrderDialogOpen: val, + isOldCharacterOrderDialogOpen: val, }), }); @@ -111,14 +126,14 @@ const orderedTalkCharacterInfos = computed(() => { "talk", ); }); -const isDefaultStyleSelectDialogOpenComputed = computed({ +const isOldDefaultStyleSelectDialogOpenComputed = computed({ get: () => !store.state.isAcceptTermsDialogOpen && - !store.state.isCharacterOrderDialogOpen && - store.state.isDefaultStyleSelectDialogOpen, + !store.state.isOldCharacterOrderDialogOpen && + store.state.isOldDefaultStyleSelectDialogOpen, set: (val) => store.actions.SET_DIALOG_OPEN({ - isDefaultStyleSelectDialogOpen: val, + isOldDefaultStyleSelectDialogOpen: val, }), }); @@ -143,8 +158,8 @@ const isDictionaryManageDialogOpenComputed = computed({ const isAcceptRetrieveTelemetryDialogOpenComputed = computed({ get: () => !store.state.isAcceptTermsDialogOpen && - !store.state.isCharacterOrderDialogOpen && - !store.state.isDefaultStyleSelectDialogOpen && + !store.state.isOldCharacterOrderDialogOpen && + !store.state.isOldDefaultStyleSelectDialogOpen && store.state.isAcceptRetrieveTelemetryDialogOpen, set: (val) => store.actions.SET_DIALOG_OPEN({ @@ -156,8 +171,8 @@ const isAcceptRetrieveTelemetryDialogOpenComputed = computed({ const canOpenNotificationDialog = computed(() => { return ( !store.state.isAcceptTermsDialogOpen && - !store.state.isCharacterOrderDialogOpen && - !store.state.isDefaultStyleSelectDialogOpen && + !store.state.isOldCharacterOrderDialogOpen && + !store.state.isOldDefaultStyleSelectDialogOpen && !store.state.isAcceptRetrieveTelemetryDialogOpen && props.isEnginesReady ); diff --git a/src/components/Dialog/CharacterDetailDialog.vue b/src/components/Dialog/CharacterDetailDialog.vue new file mode 100644 index 0000000000..24cc9343a0 --- /dev/null +++ b/src/components/Dialog/CharacterDetailDialog.vue @@ -0,0 +1,389 @@ + + + + + diff --git a/src/components/Dialog/CharacterListDialog.vue b/src/components/Dialog/CharacterListDialog.vue new file mode 100644 index 0000000000..142699467f --- /dev/null +++ b/src/components/Dialog/CharacterListDialog.vue @@ -0,0 +1,372 @@ + + + + + diff --git a/src/components/Dialog/CharacterOrderDialog.vue b/src/components/Dialog/CharacterOrderDialog.vue deleted file mode 100644 index 3ece85a70b..0000000000 --- a/src/components/Dialog/CharacterOrderDialog.vue +++ /dev/null @@ -1,355 +0,0 @@ - - - - - diff --git a/src/components/Dialog/CharacterTryListenCard.vue b/src/components/Dialog/CharacterTryListenCard.vue index d8838da856..0b228563cd 100644 --- a/src/components/Dialog/CharacterTryListenCard.vue +++ b/src/components/Dialog/CharacterTryListenCard.vue @@ -1,105 +1,59 @@ diff --git a/src/components/Dialog/DefaultStyleListDialog.vue b/src/components/Dialog/DefaultStyleListDialog.vue deleted file mode 100644 index 387ad09bcc..0000000000 --- a/src/components/Dialog/DefaultStyleListDialog.vue +++ /dev/null @@ -1,295 +0,0 @@ - - - - - diff --git a/src/components/Dialog/OldDefaultStyleListDialog.vue b/src/components/Dialog/OldDefaultStyleListDialog.vue index 387ad09bcc..d7fca57661 100644 --- a/src/components/Dialog/OldDefaultStyleListDialog.vue +++ b/src/components/Dialog/OldDefaultStyleListDialog.vue @@ -102,7 +102,7 @@