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.

Sign up for GitHub

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

Jump to bottom

[WIP] カラー+スタイルの調整 [HCT版] #2164

Draft
wants to merge 40 commits into
base: main
Choose a base branch
from
Draft

[WIP] カラー+スタイルの調整 [HCT版] #2164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ff545db
configからカラー生成
Jun 16, 2024
1fb7f92
カラーテーマ(仕掛かり)
Jun 17, 2024
2ba4376
仕掛かり
Jun 30, 2024
aae725c
仕掛かり
Jul 1, 2024
e230816
仕掛かり
Jul 1, 2024
24aa5ce
仕掛かり
Jul 4, 2024
0831964
仕掛かり
Jul 4, 2024
5c92504
仕掛かり
Jul 4, 2024
a3fb719
仕掛かり
Jul 6, 2024
269220e
調整
Jul 6, 2024
7787838
DynamicSchemeに置き換える
Jul 8, 2024
495a410
調整
Jul 8, 2024
daeb2ef
マージ
Jul 8, 2024
23bfc12
ピッチ表示調整
Jul 8, 2024
cc7f98f
コメント付与 [update snapshots]
Jul 8, 2024
c422c02
（スナップショットを更新）
github-actions[bot] Jul 8, 2024
c09f685
フォント表示修正
Jul 9, 2024
d11b2ed
フォント表示修正
Jul 9, 2024
c077474
Merge remote-tracking branch 'origin/feature/1810_re_color_from_color…
Jul 9, 2024
55f4f52
調整UI(仮)
Jul 10, 2024
64e7249
テーマ調整・確認用のUIを追加
Jul 11, 2024
731f727
ノートのスタイルを改善する
Jul 12, 2024
78278e2
ノート背景修正
Jul 12, 2024
fe7b8cb
カラー設定ヘルパーを拡張しやすくし、HEXではなくRGBAを使う
Jul 13, 2024
c89fe1e
仕掛かり: 外部jsonから読み込む
Jul 13, 2024
8560cc8
仕掛かり: 設定取得など
Jul 16, 2024
c0f49c1
HEX値でパレット作成できるようにする
Jul 16, 2024
01de615
仕掛かり: カラースキーム調整
Jul 16, 2024
97313cc
仕掛かり: 動的調整
Jul 17, 2024
84d5fb7
仕掛かり: カラースキームエディタ
Jul 17, 2024
4b7488b
composableを使用 [update snapshots]
Jul 18, 2024
6424766
Merge branch 'main' into feature/1810_re_color_from_color
romot-co Jul 18, 2024
f16f612
調整 [update snapshots]
Jul 18, 2024
17a4a4a
e2eテストが失敗するのを修正
Jul 18, 2024
2189d3a
loggerの追加および調整
Jul 18, 2024
385abb6
CustomColorGroupの使用 [update snapshots]
Jul 18, 2024
8c9185c
コントラストチェックを試行
Jul 19, 2024
c5ef5cb
カラーコントラスト
Jul 19, 2024
2e4c422
コンフリクト解消
Jul 20, 2024
f7ea6b0
package-lock
Jul 20, 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
7 changes: 7 additions & 0 deletions package-lock.json
View file
Open in desktop

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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
},
"dependencies": {
"@gtm-support/vue-gtm": "1.2.3",
"@material/material-color-utilities": "0.3.0",
"@quasar/extras": "1.10.10",
"@sevenc-nanashi/utaformatix-ts": "npm:@jsr/sevenc-nanashi__utaformatix-ts@0.3.2",
"async-lock": "1.4.0",
Expand Down
171 changes: 171 additions & 0 deletions public/color-schemes/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
{
"name": "デフォルト",
"sourceColor": "#A5D4AD",
"variant": "tonalSpot",
"contrastLevel": 0.0,
"adjustments": {
"neutral": { "chroma": 0 },
"neutralVariant": { "chroma": 6 },
"tertiary": { "hex": "#ffc919" },
"error": { "hex": "#d04756" }
},
"customPaletteColors": [
{
"name": "singGridCellWhite",
"palette": "neutral",
"lightTone": 100,
"darkTone": 15,
"blend": true,
"contrastVs": {
"singGridCellBlack": 1.0
}
},
{
"name": "singGridCellBlack",
"palette": "neutral",
"lightTone": 98,
"darkTone": 12,
"blend": true,
"contrastVs": {
"singGridCellWhite": 1.0
}
},
{
"name": "singRulerMeasureLine",
"palette": "neutralVariant",
"lightTone": 50,
"darkTone": 50,
"blend": true,
"contrastVs": {
"surfaceContainer": 1.5
}
},
{
"name": "singRulerBeatLine",
"palette": "neutralVariant",
"lightTone": 70,
"darkTone": 40,
"blend": true,
"contrastVs": {
"surfaceContainerHigh": 1.2
}
},
{
"name": "singGridVerticalLine",
"palette": "neutral",
"lightTone": 95,
"darkTone": 10,
"blend": true,
"contrastVs": {
"singGridCellBlack": 1.2
}
},
{
"name": "singGridHorizontalLine",
"palette": "neutral",
"lightTone": 95,
"darkTone": 10,
"blend": true,
"contrastVs": {
"singGridCellBlack": 1.2
}
},
{
"name": "singGridMeasureLine",
"palette": "neutral",
"lightTone": 80,
"darkTone": 40,
"blend": true,
"contrastVs": {
"singGridCellBlack": 1.5
}
},
{
"name": "singGridBeatLine",
"palette": "neutral",
"lightTone": 90,
"darkTone": 0,
"blend": true,
"contrastVs": {
"singGridCellBlack": 1.2
}
},
{
"name": "singGridOctaveLine",
"palette": "neutral",
"lightTone": 80,
"darkTone": 40,
"blend": true,
"contrastVs": {
"singGridCellBlack": 1.5
}
},
{
"name": "singPianoKeyWhite",
"palette": "neutral",
"lightTone": 99,
"darkTone": 70,
"blend": true,
"contrastVs": {
"singPianoKeyBlack": 3.0
}
},
{
"name": "singPianoKeyBlack",
"palette": "neutral",
"lightTone": 40,
"darkTone": 20,
"blend": true,
"contrastVs": {
"singPianoKeyWhite": 3.0
}
},
{
"name": "singNoteBarContainer",
"palette": "secondary",
"lightTone": 90,
"darkTone": 70,
"blend": true,
"contrastVs": {
"singGridCellBlack": 3.0
}
},
{
"name": "singNoteBarOutline",
"palette": "neutral",
"lightTone": 40,
"darkTone": 30,
"blend": true,
"contrastVs": {
"singGridCellBlack": 3.0
}
},
{
"name": "singToolbarContainer",
"palette": "neutral",
"lightTone": 99,
"darkTone": 10,
"blend": true,
"contrastVs": {
"outline": 1.5
}
}
],
"customDefinedColors": [
{
"name": "primitive-primary",
"value": "#A5D4AD",
"blend": true
},
{
"name": "primitive-blue",
"value": "#0969da",
"blend": true
},
{
"name": "primitive-red",
"value": "#d04756",
"blend": true
}
]
}
122 changes: 122 additions & 0 deletions public/color-schemes/monochrome.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
{
"name": "モノクローム",
"sourceColor": "#A5D4AD",
"variant": "monochrome",
"isDark": false,
"contrastLevel": 0.1,
"adjustments": {
"neutral": {
"chroma": 0
},
"neutralVariant": {
"chroma": 6
},
"tertiary": {
"hex": "#ffc919"
},
"error": {
"hex": "#d04756"
}
},
"customPaletteColors": [
{
"name": "sing-grid-cell-white",
"palette": "neutral",
"lightTone": 100,
"darkTone": 15,
"blend": true
},
{
"name": "sing-grid-cell-black",
"palette": "neutral",
"lightTone": 96,
"darkTone": 12,
"blend": true
},
{
"name": "sing-ruler-beat-line",
"palette": "neutralVariant",
"lightTone": 70,
"darkTone": 40,
"blend": true
},
{
"name": "sing-ruler-measure-line",
"palette": "neutralVariant",
"lightTone": 50,
"darkTone": 50,
"blend": true
},
{
"name": "sing-grid-vertical-line",
"palette": "neutral",
"lightTone": 95,
"darkTone": 10,
"blend": true
},
{
"name": "sing-grid-horizontal-line",
"palette": "neutral",
"lightTone": 95,
"darkTone": 10,
"blend": true
},
{
"name": "sing-grid-beat-line",
"palette": "neutral",
"lightTone": 90,
"darkTone": 0,
"blend": true
},
{
"name": "sing-grid-measure-line",
"palette": "neutral",
"lightTone": 80,
"darkTone": 40,
"blend": true
},
{
"name": "sing-grid-octave-line",
"palette": "neutral",
"lightTone": 80,
"darkTone": 40,
"blend": true
},
{
"name": "sing-piano-key-white",
"palette": "neutral",
"lightTone": 99,
"darkTone": 70,
"blend": true
},
{
"name": "sing-piano-key-black",
"palette": "neutral",
"lightTone": 40,
"darkTone": 20,
"blend": true
},
{
"name": "sing-note-bar-container",
"palette": "secondary",
"lightTone": 90,
"darkTone": 70,
"blend": true
},
{
"name": "sing-note-bar-outline",
"palette": "neutral",
"lightTone": 40,
"darkTone": 30,
"blend": true
},
{
"name": "sing-toolbar-container",
"palette": "neutral",
"lightTone": 100,
"darkTone": 10,
"blend": true
}
],
"customDefinedColors": []
}
Loading
Loading