diff --git a/public/color-schemes/default.json b/public/color-schemes/default.json index 297068cde5..7d9c5b294f 100644 --- a/public/color-schemes/default.json +++ b/public/color-schemes/default.json @@ -1,9 +1,13 @@ { - "name": "Default", - "displayName": "デフォルト", + "name": "DefaultFix", + "displayName": "VOICEVOXデフォルト", "roleColors": { - "primary": "#a5d4ad", - "error": "#d04756" + "primary": "oklch(80% 0.1 150)", + "secondary": "oklch(80% 0.035 150)", + "tertiary": "oklch(80% 0.1 90)", + "neutral": "oklch(60% 0.00 240)", + "neutralVariant": "oklch(80% 0.005 150)", + "error": "oklch(60% 0.18 20)" }, "aliasColors": [ { @@ -17,77 +21,84 @@ "name": "singPlaybackButtonContainer", "displayName": "ツールバー再生ボタン", "role": "primary", - "lightShade": 0.82, - "darkShade": 0.6 + "lightShade": 0.8, + "darkShade": 0.7 }, { "name": "singOnPlaybackButtonContainer", "displayName": "ツールバー再生ボタンアイコン", "role": "neutral", - "lightShade": 0.35, - "darkShade": 0.2 + "lightShade": 0.1, + "darkShade": 0.1 }, { "name": "singGridCellWhite", "displayName": "シーケンサグリッド(白鍵)", "role": "neutral", - "lightShade": 1.0, - "darkShade": 0.17 + "lightShade": 1, + "darkShade": 0.2 }, { "name": "singGridCellBlack", "displayName": "シーケンサグリッド(黒鍵)", "role": "neutral", "lightShade": 0.96, - "darkShade": 0.04 + "darkShade": 0.15 }, { "name": "singGridVerticalLine", "displayName": "シーケンサグリッド(縦線)", "role": "neutral", - "lightShade": 0.95, - "darkShade": 0.04 + "lightShade": 0.96, + "darkShade": 0.15 }, { "name": "singGridHorizontalLine", "displayName": "シーケンサグリッド(横線)", "role": "neutral", - "lightShade": 0.95, - "darkShade": 0.04 + "lightShade": 0.96, + "darkShade": 0.15 }, { "name": "singGridMeasureLine", "displayName": "シーケンサグリッド(小節線)", "role": "neutral", - "lightShade": 0.8, + "lightShade": 0.75, "darkShade": 0.4 }, { "name": "singGridBeatLine", "displayName": "シーケンサグリッド(拍線)", "role": "neutral", - "lightShade": 0.85, - "darkShade": 0.24 + "lightShade": 0.9, + "darkShade": 0.04 }, { "name": "singGridOctaveLine", "displayName": "シーケンサグリッド(オクターブ線)", "role": "neutral", - "lightShade": 0.85, + "lightShade": 0.88, + "darkShade": 0.3 + }, + { + "name": "singRulerSurface", + "displayName": "ルーラー表面", + "role": "neutral", + "lightShade": 0.9, "darkShade": 0.3 }, { "name": "singRulerMeasureLine", "displayName": "ルーラー(小節線)", - "role": "neutralVariant", + "role": "neutral", "lightShade": 0.65, - "darkShade": 0.55 + "darkShade": 0.6 }, { "name": "singRulerBeatLine", "displayName": "ルーラー(拍線)", - "role": "neutralVariant", - "lightShade": 0.7, + "role": "neutral", + "lightShade": 0.75, "darkShade": 0.45 }, { @@ -95,14 +106,14 @@ "displayName": "ピアノキー(白鍵)", "role": "neutral", "lightShade": 0.99, - "darkShade": 0.6 + "darkShade": 0.7 }, { "name": "singPianoKeyBlack", "displayName": "ピアノキー(黒鍵)", "role": "neutral", - "lightShade": 0.5, - "darkShade": 0.24 + "lightShade": 0.45, + "darkShade": 0.2 }, { "name": "singNoteBarContainer", @@ -110,95 +121,346 @@ "role": "secondary", "lightShade": 0.88, "darkShade": 0.7 - } - ], - "customColors": [ + }, { - "name": "link", - "displayName": "リンク", - "sourceColor": "#0969da" + "name": "singOnNoteBarContainer", + "displayName": "ノートコンテナ上", + "role": "secondary", + "lightShade": 0.1, + "darkShade": 0.1 }, { - "name": "pink", - "displayName": "ピンク", - "sourceColor": "oklch(70% 0.14 0)" + "name": "singNoteBarOutline", + "displayName": "ノートコンテナ外枠", + "role": "secondary", + "lightShade": 0.6, + "darkShade": 0.85 }, { - "name": "orange", - "displayName": "オレンジ", - "sourceColor": "oklch(70% 0.13 45)" + "name": "singNoteBarSelectedContainer", + "displayName": "ノートコンテナ(選択)", + "role": "primary", + "lightShade": 0.96, + "darkShade": 0.8 }, { - "name": "yellow", - "displayName": "イエロー", - "sourceColor": "oklch(70% 0.13 90)" + "name": "singOnNoteBarSelectedContainer", + "displayName": "ノートコンテナ(選択上)", + "role": "primary", + "lightShade": 0.1, + "darkShade": 0.1 + }, + { + "name": "singNoteBarSelectedOutline", + "displayName": "ノートコンテナ(選択外枠)", + "role": "primary", + "lightShade": 0.6, + "darkShade": 0.95 }, { - "name": "green", - "displayName": "グリーン", - "sourceColor": "oklch(70% 0.13 135)" + "name": "singNoteBarSelectedOutlineOuter", + "displayName": "ノートコンテナ(選択外枠外)", + "role": "primary", + "lightShade": 0.8, + "darkShade": 0.6 }, { - "name": "teal", - "displayName": "ティール", - "sourceColor": "oklch(70% 0.13 180)" + "name": "singNoteBarPreviewContainer", + "displayName": "ノートコンテナ(プレビュー)", + "role": "tertiary", + "lightShade": 0.88, + "darkShade": 0.7 }, { - "name": "skyblue", - "displayName": "スカイブルー", - "sourceColor": "oklch(70% 0.13 225)" + "name": "singOnNoteBarPreviewContainer", + "displayName": "ノートコンテナ(プレビュー上)", + "role": "tertiary", + "lightShade": 0.1, + "darkShade": 0.1 }, { - "name": "indigo", - "displayName": "インディゴ", - "sourceColor": "oklch(70% 0.13 270)" + "name": "singNoteBarPreviewOutline", + "displayName": "ノートコンテナ(プレビュー外枠)", + "role": "tertiary", + "lightShade": 0.6, + "darkShade": 0.85 + }, + { + "name": "singNoteBarPreviewOutlineOuter", + "displayName": "ノートコンテナ(プレビュー外枠)", + "role": "tertiary", + "lightShade": 0.8, + "darkShade": 0.6 + }, + { + "name": "singShadowNote", + "displayName": "ノートコンテナ(別トラック)", + "role": "neutralVariant", + "lightShade": 0.88, + "darkShade": 0.7 + } + ], + "customColors": [ + { + "name": "link", + "displayName": "リンクブルー", + "sourceColor": "oklch(54% 0.19 256)" + }, + { + "name": "orange", + "displayName": "マンゴーオレンジ", + "sourceColor": "oklch(80% 0.098 45)" }, { "name": "purple", - "displayName": "パープル", - "sourceColor": "oklch(70% 0.13 315)" + "displayName": "ラベンダーパープル", + "sourceColor": "oklch(80% 0.115 296)" + }, + { + "name": "a", + "displayName": "a", + "sourceColor": "#FCBB7E" + }, + { + "name": "b", + "displayName": "b", + "sourceColor": "#BBADFF" + }, + { + "name": "c", + "displayName": "c", + "sourceColor": "#B9DD83" + }, + { + "name": "d", + "displayName": "d", + "sourceColor": "#E594Df" } ], "contrastPairs": [ { - "colors": ["singGridCellBlack", "singGridCellWhite"], + "colors": [ + "singToolbarContainer", + "singPlaybackButtonContainer" + ], + "requiredContrast": 45, + "description": "ツールバー - 再生ボタン" + }, + { + "colors": [ + "singPlaybackButtonContainer", + "singOnPlaybackButtonContainer" + ], + "requiredContrast": 45, + "description": "再生ボタン - ツールバー再生ボタンアイコン" + }, + { + "colors": [ + "singToolbarContainer", + "surfaceContainerLowest" + ], "requiredContrast": 15, - "description": "シーケンサグリッド(黒鍵) - シーケンサグリッド(白鍵)" + "description": "ツールバーコンテナ - 最低コンテナ表面" + }, + { + "colors": [ + "singToolbarContainer", + "surfaceContainerHighest" + ], + "requiredContrast": 0, + "description": "ツールバーコンテナ - 最高コンテナ表面" }, { - "colors": ["singGridVerticalLine", "singGridCellBlack"], + "colors": [ + "singToolbarContainer", + "secondaryContainer" + ], "requiredContrast": 0, - "description": "シーケンサグリッド(縦線) - シーケンサグリッド(黒鍵)" + "description": "ツールバーコンテナ - セカンダリコンテナ" + }, + { + "colors": [ + "singGridCellWhite", + "singGridCellBlack" + ], + "requiredContrast": 0, + "description": "グリッド白鍵 - グリッド黒鍵" + }, + { + "colors": [ + "singGridCellWhite", + "singGridVerticalLine" + ], + "requiredContrast": 0, + "description": "グリッド白鍵 - 縦線" + }, + { + "colors": [ + "singGridCellWhite", + "singGridHorizontalLine" + ], + "requiredContrast": 0, + "description": "グリッド白鍵 - 横線" + }, + { + "colors": [ + "singGridCellWhite", + "singGridMeasureLine" + ], + "requiredContrast": 15, + "description": "グリッド白鍵 - 小節線" + }, + { + "colors": [ + "singGridCellWhite", + "singGridBeatLine" + ], + "requiredContrast": 15, + "description": "グリッド白鍵 - 拍線" + }, + { + "colors": [ + "singGridCellWhite", + "singGridOctaveLine" + ], + "requiredContrast": 15, + "description": "グリッド白鍵 - オクターブ線" + }, + { + "colors": [ + "singGridCellBlack", + "singRulerSurface" + ], + "requiredContrast": 15, + "description": "グリッド黒鍵 - ルーラー表面" + }, + { + "colors": [ + "singRulerSurface", + "singRulerMeasureLine" + ], + "requiredContrast": 15, + "description": "ルーラー表面 - ルーラー(小節線)" + }, + { + "colors": [ + "singRulerSurface", + "singRulerBeatLine" + ], + "requiredContrast": 15, + "description": "ルーラー表面 - ルーラー(拍線)" + }, + { + "colors": [ + "singGridCellWhite", + "singNoteBarContainer" + ], + "requiredContrast": 15, + "description": "グリッド白鍵 - ノート" + }, + { + "colors": [ + "singNoteBarContainer", + "singOnNoteBarContainer" + ], + "requiredContrast": 15, + "description": "ノートコンテナ - ノートコンテナ(選択上)" }, { - "colors": ["singGridHorizontalLine", "singGridCellBlack"], + "colors": [ + "singNoteBarContainer", + "singNoteBarSelectedContainer" + ], "requiredContrast": 0, - "description": "シーケンサグリッド(横線) - シーケンサグリッド(黒鍵)" + "description": "ノートコンテナ - ノートコンテナ(選択)" }, { - "colors": ["singGridMeasureLine", "singGridCellBlack"], + "colors": [ + "singNoteBarOutline", + "singGridCellBlack" + ], + "requiredContrast": 60, + "description": "ノートコンテナ外枠 - グリッド黒鍵" + }, + { + "colors": [ + "singGridCellWhite", + "singNoteBarContainer" + ], "requiredContrast": 15, - "description": "シーケンサグリッド(小節線) - シーケンサグリッド(黒鍵)" + "description": "グリッド白鍵 - ノート" }, { - "colors": ["singGridBeatLine", "singGridCellBlack"], + "colors": [ + "singNoteBarContainer", + "singOnNoteBarContainer" + ], "requiredContrast": 15, - "description": "シーケンサグリッド(拍線) - シーケンサグリッド(黒鍵)" + "description": "ノートコンテナ - ノートコンテナ(選択上)" + }, + { + "colors": [ + "singNoteBarContainer", + "singNoteBarSelectedContainer" + ], + "requiredContrast": 0, + "description": "ノートコンテナ - ノートコンテナ(選択)" + }, + { + "colors": [ + "singNoteBarOutline", + "singGridCellBlack" + ], + "requiredContrast": 60, + "description": "ノートコンテナ外枠 - グリッド黒鍵" }, { - "colors": ["singGridOctaveLine", "singGridCellBlack"], + "colors": [ + "singGridCellWhite", + "singNoteBarSelectedContainer" + ], "requiredContrast": 15, - "description": "シーケンサグリッド(オクターブ線) - シーケンサグリッド(黒鍵)" + "description": "グリッド白鍵 - ノートコンテナ(選択)" + }, + { + "colors": [ + "singNoteBarSelectedContainer", + "singOnNoteBarSelectedContainer" + ], + "requiredContrast": 15, + "description": "ノートコンテナ(選択) - ノートコンテナ(選択上)" + }, + { + "colors": [ + "singNoteBarSelectedContainer", + "singNoteBarSelectedOutline" + ], + "requiredContrast": 0, + "description": "ノートコンテナ(選択) - ノートコンテナ(選択外枠)" + }, + { + "colors": [ + "singNoteBarSelectedOutline", + "singGridCellBlack" + ], + "requiredContrast": 60, + "description": "ノートコンテナ(選択外枠) - グリッド黒鍵" }, { - "colors": ["singRulerMeasureLine", "surfaceContainerHighest"], + "colors": [ + "singPianoKeyWhite", + "singPianoKeyBlack" + ], "requiredContrast": 15, - "description": "ルーラー(小節線) - 最高コンテナ表面" + "description": "ピアノキー白鍵 - ピアノキー黒鍵" }, { - "colors": ["singRulerBeatLine", "surfaceContainerHighest"], + "colors": [ + "singGridCellWhite", + "inversePrimary" + ], "requiredContrast": 15, - "description": "ルーラー(拍線) - 最高コンテナ表面" + "description": "グリッド白鍵 - インバースプライマリ" } ] } \ No newline at end of file diff --git a/src/components/Sing/CharacterMenuButton/SelectedCharacter.vue b/src/components/Sing/CharacterMenuButton/SelectedCharacter.vue index f324ef6514..1150527d28 100644 --- a/src/components/Sing/CharacterMenuButton/SelectedCharacter.vue +++ b/src/components/Sing/CharacterMenuButton/SelectedCharacter.vue @@ -1,6 +1,6 @@ @@ -1530,7 +1531,8 @@ const contextMenuData = computed(() => { .sequencer-corner { grid-row: 1; grid-column: 1; - background: var(--scheme-color-surface-container-highest); + background: var(--scheme-color-sing-ruler-surface); + border-radius: 4px 0 0 0; } .sequencer-ruler { @@ -1597,7 +1599,7 @@ const contextMenuData = computed(() => { .sequencer-guideline { position: absolute; top: 0; - left: 0; + left: -0.5px; width: 1px; background: var(--scheme-color-secondary-container); pointer-events: none; @@ -1650,50 +1652,61 @@ const contextMenuData = computed(() => { .zoom-x-slider { position: fixed; bottom: 16px; - right: 32px; + right: 64px; width: 80px; :deep(.q-slider__track) { - background: var(--scheme-color-surface-container); - color: var(--scheme-color-secondary-fixed); + background: var(--scheme-color-outline-variant); + color: var(--scheme-color-secondary); } :deep(.q-slider__thumb) { - color: var(--scheme-color-secondary-fixed); + color: var(--scheme-color-secondary); } &:hover { :deep(.q-slider__track) { - color: var(--scheme-color-primary-fixed-dim); + color: var(--scheme-color-primary); } :deep(.q-slider__thumb) { - color: var(--scheme-color-primary-fixed-dim); + color: var(--scheme-color-primary); } } } .zoom-y-slider { position: fixed; - bottom: 40px; + bottom: 64px; right: 16px; height: 80px; :deep(.q-slider__track) { - background: var(--scheme-color-surface-container); - color: var(--scheme-color-secondary-fixed); + background: var(--scheme-color-outline-variant); + color: var(--scheme-color-secondary); } :deep(.q-slider__thumb) { - color: var(--scheme-color-secondary-fixed); + color: var(--scheme-color-secondary); } &:hover { :deep(.q-slider__track) { - color: var(--scheme-color-primary-fixed-dim); + color: var(--scheme-color-primary); } :deep(.q-slider__thumb) { - color: var(--scheme-color-primary-fixed-dim); + color: var(--scheme-color-primary); } } } + +.character-selecter { + background: var(--scheme-color-pink-container); + border: 1px solid var(--scheme-color-pink); + border-radius: 50%; + width: 40px; + height: 40px; + position: fixed; + bottom: 20px; + right: 20px; +} diff --git a/src/components/Sing/SequencerKeys.vue b/src/components/Sing/SequencerKeys.vue index a827ab0746..7784d74d45 100644 --- a/src/components/Sing/SequencerKeys.vue +++ b/src/components/Sing/SequencerKeys.vue @@ -220,6 +220,7 @@ onUnmounted(() => { } .pitchname { + font-weight: 500; fill: var(--scheme-color-sing-piano-key-black); } diff --git a/src/components/Sing/SequencerLyricInput.vue b/src/components/Sing/SequencerLyricInput.vue index 200d0ca78e..e9b39bd62a 100644 --- a/src/components/Sing/SequencerLyricInput.vue +++ b/src/components/Sing/SequencerLyricInput.vue @@ -111,25 +111,26 @@ watch( .lyric-input-container { position: absolute; - top: 0; - width: auto; + top: -2px; + left: -2px; } .lyric-input { + display: inline-block; font-weight: 500; font-size: 16px; - background-color: oklch(from var(--scheme-color-background) l c h / 0.92); - backdrop-filter: blur(2px); + box-sizing: border-box; + background-color: oklch(from var(--scheme-color-background) l c h / 0.88); + backdrop-filter: blur(1px); color: var(--scheme-color-on-surface); - border: 1px solid var(--scheme-color-primary); - outline: 2px solid oklch(from var(--scheme-color-primary) l c h / 0.92); - border-radius: 4px; - border: 0; + outline-offset: 1px; + border: 1px solid var(--scheme-color-inverse-surface); box-shadow: - 0 4px 6px oklch(from var(--scheme-color-scrim) l c h / 0.1), - 0 1px 3px oklch(from var(--scheme-color-scrim) l c h / 0.8); + oklch(from var(--scheme-color-scrim) l c h / 0.19) 0px 8px 20px, + oklch(from var(--scheme-color-scrim) l c h / 0.23) 0px 6px 6px; + outline: 0; + border-radius: 4px; padding: 0 4px; - width: 7ch; - box-sizing: border-box; + width: 10ch; } diff --git a/src/components/Sing/SequencerNote.vue b/src/components/Sing/SequencerNote.vue index bb24d35068..dd668fd99b 100644 --- a/src/components/Sing/SequencerNote.vue +++ b/src/components/Sing/SequencerNote.vue @@ -235,14 +235,24 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { position: fixed; left: 2px; bottom: 0; - color: var(--scheme-color-on-secondary-fixed); + color: var(--scheme-color-sing-on-note-bar-container); font-size: 1rem; font-weight: 400; letter-spacing: -0.1em; white-space: nowrap; pointer-events: none; background: transparent; - transition: font-size 0.2s ease; + text-shadow: + -1px -1px 0 var(--scheme-color-sing-note-bar-container), + 1px -1px 0 var(--scheme-color-sing-note-bar-container), + -1px 1px 0 var(--scheme-color-sing-note-bar-container), + 1px 1px 0 var(--scheme-color-sing-note-bar-container), + 0 -1px 0 var(--scheme-color-sing-note-bar-container), + 0 1px 0 var(--scheme-color-sing-note-bar-container), + -1px 0 0 var(--scheme-color-sing-note-bar-container), + 1px 0 0 var(--scheme-color-sing-note-bar-container); + // アンチエイリアス + -webkit-font-smoothing: subpixel-antialiased; } .note-bar { @@ -251,7 +261,7 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { width: calc(100% + 1px); height: 100%; background-color: var(--scheme-color-sing-note-bar-container); - border: 1px solid var(--scheme-color-secondary-fixed-dim); + border: 1px solid var(--scheme-color-sing-note-bar-outline); border-radius: 4px; } @@ -264,11 +274,6 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { min-width: 4px; max-width: 8px; height: 100%; - - &:hover { - // FIXME: hoverだとカーソル位置によって適用されないので、プレビュー中に明示的にクラス指定する - background-color: var(--scheme-color-secondary-fixed-dim); - } } .note-right-edge { @@ -282,39 +287,58 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { height: 100%; &:hover { - // FIXME: hoverだとカーソル位置によって適用されないので、プレビュー中に明示的にクラス指定する - background-color: var(--scheme-color-secondary-fixed-dim); + background-color: var(--scheme-color-sing-note-bar-outline); } } &.selected-or-preview { .note-bar { - background-color: var(--scheme-color-primary-fixed); - border-color: var(--scheme-color-primary-fixed-dim); + background-color: var(--scheme-color-sing-note-bar-selected-container); + border-color: var(--scheme-color-sing-note-bar-selected-outline); + border-width: 1px; + outline: 1px solid + var(--scheme-color-sing-note-bar-selected-outline-outer); + outline-offset: 1px; } .note-lyric { - color: var(--scheme-color-on-primary-fixed); + color: var(--scheme-color-sing-on-note-bar-selected-container); + text-shadow: + -1px -1px 0 var(--scheme-color-sing-note-bar-selected-container), + 1px -1px 0 var(--scheme-color-sing-note-bar-selected-container), + -1px 1px 0 var(--scheme-color-sing-note-bar-selected-container), + 1px 1px 0 var(--scheme-color-sing-note-bar-selected-container), + 0 -1px 0 var(--scheme-color-sing-note-bar-selected-container), + 0 1px 0 var(--scheme-color-sing-note-bar-selected-container), + -1px 0 0 var(--scheme-color-sing-note-bar-selected-container), + 1px 0 0 var(--scheme-color-sing-note-bar-selected-container); } .note-right-edge:hover, .note-left-edge:hover { - background-color: var(--scheme-color-primary-fixed-dim); + background-color: var(--scheme-color-sing-note-bar-selected-outline); } } &.preview-lyric { .note-bar { - background-color: oklch( - from var(--scheme-color-primary-fixed) l c h / 0.8 - ); - outline: 1px solid - oklch(from var(--scheme-color-primary-fixed-dim) l c h / 0.56); + background-color: var(--scheme-color-sing-note-bar-preview-container); + border-color: var(--scheme-color-sing-note-bar-preview-outline); + outline: 1px solid var(--scheme-color-sing-note-bar-preview-outline-outer); outline-offset: 1px; } .note-lyric { opacity: 0.38; + text-shadow: + -1px -1px 0 var(--scheme-color-sing-note-bar-preview-container), + 1px -1px 0 var(--scheme-color-sing-note-bar-preview-container), + -1px 1px 0 var(--scheme-color-sing-note-bar-preview-container), + 1px 1px 0 var(--scheme-color-sing-note-bar-preview-container), + 0 -1px 0 var(--scheme-color-sing-note-bar-preview-container), + 0 1px 0 var(--scheme-color-sing-note-bar-preview-container), + -1px 0 0 var(--scheme-color-sing-note-bar-preview-container), + 1px 0 0 var(--scheme-color-sing-note-bar-preview-container); } } @@ -323,6 +347,7 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { .note-bar { background-color: var(--scheme-color-surface-variant); border-color: var(--scheme-color-error); + outline-color: var(--scheme-color-error-container); } .note-right-edge:hover, @@ -331,15 +356,22 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { } .note-lyric { - color: var(--scheme-color-on-surface-variant); + color: var(--scheme-color-on-error-container); opacity: 0.38; text-shadow: none; } - &.selected-or-preview { + &.selected-or-preview, + &:active { .note-bar { background-color: var(--scheme-color-error-container); border-color: var(--scheme-color-error); + outline-color: var(--scheme-color-error); + } + + .note-lyric { + color: var(--scheme-color-on-error-container); + text-shadow: none; } } } @@ -348,12 +380,14 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { .note-bar { background-color: var(--scheme-color-surface-variant); border-color: var(--scheme-color-outline-variant); - opacity: 0.38; + outline: none; + opacity: 0.8; } .note-lyric { color: var(--scheme-color-on-surface); - opacity: 0.72; + opacity: 0.8; + text-shadow: none; } .note-right-edge:hover, @@ -364,8 +398,14 @@ const onLeftEdgeMouseDown = (event: MouseEvent) => { &.overlapping, &.invalid-phrase { .note-bar { - background-color: var(--scheme-color-error-container); + background: var(--scheme-color-surface-variant); border-color: var(--scheme-color-error); + outline: none; + } + + .note-lyric { + color: var(--scheme-color-error); + text-shadow: none; } } } diff --git a/src/components/Sing/SequencerPhraseIndicator.vue b/src/components/Sing/SequencerPhraseIndicator.vue index 44727e7630..e84bdc8db3 100644 --- a/src/components/Sing/SequencerPhraseIndicator.vue +++ b/src/components/Sing/SequencerPhraseIndicator.vue @@ -44,16 +44,16 @@ const className = computed(() => { } .waiting-to-be-rendered { - background-color: var(--scheme-color-background); - background-image: linear-gradient( - to right, - --scheme-color-primary-fixed-dim, - --scheme-color-primary-fixed-dim + background-color: color-mix( + in oklch, + var(--scheme-color-secondary-fixed-dim) 70%, + var(--scheme-color-background) ); + /* @include tint-if-in-other-track( "background-color", color-mix(in srgb, colors.$primary 80%, colors.$background) - ); + ); */ } .now-rendering { diff --git a/src/components/Sing/SequencerRuler.vue b/src/components/Sing/SequencerRuler.vue index fb4243d578..bbeedf19bd 100644 --- a/src/components/Sing/SequencerRuler.vue +++ b/src/components/Sing/SequencerRuler.vue @@ -198,7 +198,7 @@ onUnmounted(() => { @use "@/styles/colors" as colors; .sequencer-ruler { - background: var(--scheme-color-surface-container-highest); + background: var(--scheme-color-sing-ruler-surface); height: 40px; position: relative; overflow: hidden; @@ -216,6 +216,7 @@ onUnmounted(() => { } .sequencer-ruler-measure-number { + font-weight: 500; fill: var(--scheme-color-on-surface-variant); } diff --git a/src/components/Sing/SequencerShadowNote.vue b/src/components/Sing/SequencerShadowNote.vue index 77314cde5e..891dae3eda 100644 --- a/src/components/Sing/SequencerShadowNote.vue +++ b/src/components/Sing/SequencerShadowNote.vue @@ -57,16 +57,23 @@ const width = computed(() => { position: absolute; top: 0; left: 0; - pointer-events: none; + //pointer-events: none; + + &:hover { + .shadow-line { + opacity: 0.5; + } + } .shadow-line { + border-radius: 1px; position: absolute; top: 50%; left: 0; width: 100%; height: 2px; transform: translateY(-50%); - background-color: var(--scheme-color-sing-grid-octave-line); + background-color: var(--scheme-color-sing-shadow-note); } } diff --git a/src/components/Sing/ToolBar/EditTargetSwicher.vue b/src/components/Sing/ToolBar/EditTargetSwicher.vue index c15bc539c0..7acd50861f 100644 --- a/src/components/Sing/ToolBar/EditTargetSwicher.vue +++ b/src/components/Sing/ToolBar/EditTargetSwicher.vue @@ -58,19 +58,20 @@ const handleKeyDown = (event: KeyboardEvent) => {