Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

マルチトラック:mainからマージ #2184

Merged
merged 23 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
052cf56
ヘルプ画面のライセンス情報セクションのリデザイン (#1650)
takusea Dec 18, 2023
8a72c8d
ヘルプ画面のライセンス情報セクションのリデザイン (#1684)
takusea Jan 1, 2024
38c7e30
新しい色変数の作成(リデザイン後のUI部分のダークモード対応) (#1756)
takusea Feb 4, 2024
295c5b0
ヘルプ画面の音声ライブラリの利用規約セクションのリデザイン (#1831)
takusea Feb 20, 2024
f2a741f
[project-redisign-help-dialog] Refactor: Markdown表示のセクションをHelpMarkdow…
takusea Mar 2, 2024
58f82fe
[project-redisign-help-dialog] ヘルプダイアログのデザインの最終調整 (#1905)
takusea Mar 20, 2024
5e917cf
[project-redisign-help-dialog] ヘルプ画面のナビゲーションバーのリデザイン (#1958)
takusea Apr 5, 2024
9521894
[project-redisign-help-dialog]各セクションの背景色の統合 (#2048)
takusea May 3, 2024
b6a07dd
[project-redisign-help-dialog]ファイルパスをmainリポジトリに合わせる (#2059)
takusea May 10, 2024
1247fed
[project-redisign-help-dialog] 色変数名をnew-color-*からcolor-v2-*に変更 (#2132)
takusea Jun 27, 2024
8619610
Merge remote-tracking branch 'upstream/main' into marge-main-to-proje…
takusea Jun 27, 2024
d2a6df0
HelpDialog関連のコンポーネントにmainリポジトリの差分を適用
takusea Jun 27, 2024
64889bd
formatを適用
takusea Jun 27, 2024
45e7453
Update package-lock.json
takusea Jun 27, 2024
33d19fe
Merge remote-tracking branch 'upstream/main' into marge-main-to-proje…
takusea Jun 30, 2024
dd47ed4
[project-redisign-help-dialog] mainリポジトリの変更差分を反映 (#2147)
Hiroshiba Jun 30, 2024
bb22dc0
[project-redisign-help-dialog] デザインの微調整 (#2149)
takusea Jul 1, 2024
82e1507
[project-redisign-help-dialog] デザインの調整 (#2155)
takusea Jul 5, 2024
2b1aec7
[project-redesign-help-dialog]mainリポジトリへのマージに向けた最終調整 (#2160)
takusea Jul 24, 2024
bb42a89
Vuexのコマンドのsnapshotテストを追加 (#2175)
Hiroshiba Jul 24, 2024
846d07c
[project-redesign-help-dialog]mainリポジトリへマージする (#2169)
Hiroshiba Jul 25, 2024
b249624
vuexのstoreの呼び出しをリテラル引数からDot記法へ: command.ts, preset.ts, engine.ts, pro…
Segu-g Jul 27, 2024
548124c
Merge: main -> buffer/project-multitrack/20240730
sevenc-nanashi Jul 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 69 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
"multistream": "4.1.0",
"pixi.js": "7.4.0",
"quasar": "2.11.6",
"radix-vue": "1.2.3",
"rfdc": "1.4.1",
"semver": "7.5.4",
"shlex": "2.1.2",
Expand Down
1 change: 1 addition & 0 deletions public/howtouse.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
その際は Finder で `Ctrl` キーを押しながら VOICEVOX アプリケーションアイコンをクリックし、ショートカットメニューから「開く」を選択してから、「開く」をクリックしてください。

もしくは、アップルメニューから「システム設定」を選択して「プライバシーとセキュリティ」 をクリックし、ページの下にあるセキュリティの「このまま開く」を選んでください。

<img src="res/macos-system-settings-security.png" style="max-height: 16rem" alt="Macのシステム設定の「プライバシーとセキュリティ」を開いた画面"/>

macOS Ventura 以前をお使いの場合は、アップルメニューから「システム環境設定」を選択して「セキュリティとプライバシー」 をクリックし、「一般」パネルで「このまま開く」選んでください。
Expand Down
3 changes: 2 additions & 1 deletion src/backend/browser/fileImpl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { openDB } from "./browserConfig";
import { SandboxKey } from "@/type/preload";
import { failure, success } from "@/type/result";
import { createLogger } from "@/domain/frontend/log";
import { uuid4 } from "@/helpers/random";

const log = createLogger("fileImpl");

Expand Down Expand Up @@ -200,7 +201,7 @@ export const showOpenFilePickerImpl = async (options: {
});
const paths = [];
for (const handle of handles) {
const fakePath = `<browser-dummy-${crypto.randomUUID()}>-${handle.name}`;
const fakePath = `<browser-dummy-${uuid4()}>-${handle.name}`;
fileHandleMap.set(fakePath, handle);
paths.push(fakePath);
}
Expand Down
93 changes: 93 additions & 0 deletions src/components/Base/BaseButton.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
<template>
<button
class="button"
:class="variant ? variant : 'default'"
@click="(payload) => $emit('click', payload)"
>
<!-- 暫定でq-iconを使用 -->
<QIcon v-if="icon" :name="icon" size="sm" />
{{ label }}
</button>
</template>

<script setup lang="ts">
defineProps<{
label: string;
icon?: string;
variant?: "default" | "primary" | "danger";
}>();

defineEmits<{
(e: "click", payload: MouseEvent): void;
}>();
</script>

<style scoped lang="scss">
@use "@/styles/v2/variables" as vars;
@use "@/styles/v2/mixin" as mixin;
@use "@/styles/v2/colors" as colors;

.button {
display: flex;
justify-content: space-between;
align-items: center;
height: vars.$size-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;
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);

&:active:not(:disabled) {
box-shadow: 0 0 0 transparent;
}

&:focus-visible {
@include mixin.on-focus;
}
}

.default {
color: colors.$display;
border-color: colors.$border;
background-color: colors.$control;

&:hover:not(:disabled) {
background-color: colors.$control-hovered;
}

&:active:not(:disabled) {
background-color: colors.$control-pressed;
}
}

.primary {
color: colors.$display-oncolor;
border-color: colors.$border;
background-color: colors.$primary;

&:hover:not(:disabled) {
background-color: colors.$primary-hovered;
}

&:active:not(:disabled) {
background-color: colors.$primary-pressed;
}
}

.danger {
color: colors.$display-warning;
border-color: colors.$display-warning;
background-color: colors.$warning;

&:hover:not(:disabled) {
background-color: colors.$warning-hovered;
}

&:active:not(:disabled) {
background-color: colors.$warning-pressed;
}
}
</style>
168 changes: 168 additions & 0 deletions src/components/Base/BaseDocumentView.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<template>
<div class="document">
<slot />
</div>
</template>

<style scoped lang="scss">
@use "@/styles/v2/variables" as vars;
@use "@/styles/v2/mixin" as mixin;
@use "@/styles/v2/colors" as colors;

.document {
:deep(*) {
margin: 0;
}

:deep(h1) {
@include mixin.headline-1;
margin-bottom: 2rem;
}

:deep(h2) {
@include mixin.headline-2;
padding-block: 0.5rem;
margin-top: 2rem;
margin-bottom: 1.5rem;
border-bottom: 1px solid colors.$border;
}

:deep(h3) {
@include mixin.headline-3;
margin-top: 1.75rem;
margin-bottom: 1rem;
}

:deep(h4) {
@include mixin.headline-4;
margin-top: 1.5rem;
margin-bottom: 0.5rem;
}

:deep(h5) {
@include mixin.headline-5;
margin-top: 1rem;
margin-bottom: 0.25rem;
}

:deep(h6) {
@include mixin.headline-6;
margin-top: 0.75rem;
}

:deep(p) {
line-height: 1.75;
margin-bottom: 1rem;
}

:deep(ul),
:deep(ol) {
padding-left: 1.5rem;
}

:deep(> ul),
:deep(> ol),
:deep(:where(div, details) > ul),
:deep(:where(div, details) > ol) {
margin-bottom: 1rem;
}

:deep(li) {
line-height: 1.75;
margin-top: 0.25rem;
}

:deep(a) {
color: colors.$display-link;

&:focus-visible {
@include mixin.on-focus;
}
}

:deep(img) {
border: 1px solid colors.$border;
border-radius: vars.$radius-1;
vertical-align: middle;
max-width: 100%;
}

:deep(> img),
:deep(:where(div, details) > img) {
display: block;
margin-bottom: 1rem;
}

:deep(hr) {
border: none;
height: 1px;
background-color: colors.$border;
margin-top: 2rem;
margin-bottom: 2rem;
}

:deep(pre) {
padding: vars.$padding-1;
margin-bottom: 1rem;
background-color: colors.$surface;
border: 1px solid colors.$border;
border-radius: vars.$radius-1;
}

:deep(:not(pre) > code) {
padding: 4px;
background-color: colors.$surface;
border: 1px solid colors.$border;
border-radius: 4px;
}

:deep(table) {
border-collapse: separate;
border-spacing: 0;
border-radius: vars.$radius-1;
border: 1px solid colors.$border;
}

:deep(tr) {
height: vars.$size-control;
}

:deep(td),
:deep(th) {
padding-inline: vars.$padding-2;
}

:deep(td) {
border-top: 1px solid colors.$border;
}

:deep(details) {
margin-bottom: 1rem;
padding: vars.$padding-2;
background-color: colors.$surface;
border: 1px solid colors.$border;
border-radius: vars.$radius-1;
}

:deep(summary) {
padding: vars.$padding-2;
margin: calc(#{vars.$padding-2} * -1);
cursor: pointer;
}

:deep(details[open] > summary) {
margin-bottom: 0;
}
:deep(summary::before) {
content: "▶ ";
}

:deep(details[open] > summary::before) {
content: "▼ ";
}

:deep(:last-child) {
margin-bottom: 0;
}
}
</style>
Loading
Loading