diff --git a/publish/changeLog.md b/publish/changeLog.md index e62603b3..0cabb5dd 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -12,7 +12,7 @@ - 新增将本地歌曲添加到我的列表的支持，此功能可以在列表的右击菜单中使用（本地歌曲的歌词优先尝试读取相同路径下的同名歌词文件，若文件不存在则尝试读取歌曲文件内的歌词，若还是找不到歌词则尝试利用换源功能获取在线歌词，歌曲封面则是尝试读取歌曲文件内的封面，若不存在则利用换源功能获取在线封面） - 启动软件时自动回到上次的界面，例如上次退出软件时在我的列表，下次启动软件时会自动进入我的列表 - 新增启动软件时自动播放音乐设置，默认关闭，可去设置-播放设置开启 -- 新增“蛋雅深藍”皮肤 +- 新增“蛋雅深藍”、“近墨者黑”皮肤 - 新增歌词时是否歌词翻译、罗马音设置，默认关闭，可以去设置-下载设置开启（#344） - 新增界面字体大小设置 - 桌面歌词新增竖排歌词显示功能（#971） diff --git a/src/common/theme/createThemes.js b/src/common/theme/createThemes.js index dbb59bf2..860635e5 100644 --- a/src/common/theme/createThemes.js +++ b/src/common/theme/createThemes.js @@ -292,6 +292,29 @@ const defaultThemes = [ '--color-badge-tertiary': 'var(--color-primary-light-100)', }, }, + { + id: 'china_ink', + name: '近墨者黑', + isDark: false, + config: { + primary: 'rgba(47, 47, 47, 1)', + '--color-app-background': 'rgba(255, 255, 255, 0)', + '--color-main-background': 'rgba(255, 255, 255, 0.8)', + '--color-nav-font': 'var(--color-primary)', + '--background-image': 'url(./theme_images/china_ink.jpg)', + '--background-image-position': 'center', + '--background-image-size': 'cover', + + + '--color-btn-hide': 'rgba(183, 212, 208, 1)', + '--color-btn-min': 'rgba(200, 214, 183, 1)', + '--color-btn-close': 'rgba(218, 195, 188, 1)', + + '--color-badge-primary': 'rgba(137, 70, 70, 1)', + '--color-badge-secondary': 'rgba(67, 139, 65, 1)', + '--color-badge-tertiary': 'rgba(132, 135, 65, 1)', + }, + }, { id: 'happy_new_year', name: '新年快乐', diff --git a/src/common/theme/images/china_ink.jpg b/src/common/theme/images/china_ink.jpg new file mode 100644 index 00000000..4a6f2184 Binary files /dev/null and b/src/common/theme/images/china_ink.jpg differ diff --git a/src/common/theme/index.json b/src/common/theme/index.json index 3c4cf31f..505324e3 100644 --- a/src/common/theme/index.json +++ b/src/common/theme/index.json @@ -3054,6 +3054,241 @@ } } }, + { + "id": "china_ink", + "name": "近墨者黑", + "isDark": false, + "isCustom": false, + "config": { + "themeColors": { + "--color-primary": "rgba(47, 47, 47, 1)", + "--color-primary-dark-100": "rgba(42,42,42, 1)", + "--color-primary-dark-100-alpha-100": "rgba(42, 42, 42, 0.90)", + "--color-primary-alpha-100": "rgba(47, 47, 47, 0.90)", + "--color-primary-dark-100-alpha-200": "rgba(42, 42, 42, 0.80)", + "--color-primary-alpha-200": "rgba(47, 47, 47, 0.80)", + "--color-primary-dark-100-alpha-300": "rgba(42, 42, 42, 0.70)", + "--color-primary-alpha-300": "rgba(47, 47, 47, 0.70)", + "--color-primary-dark-100-alpha-400": "rgba(42, 42, 42, 0.60)", + "--color-primary-alpha-400": "rgba(47, 47, 47, 0.60)", + "--color-primary-dark-100-alpha-500": "rgba(42, 42, 42, 0.50)", + "--color-primary-alpha-500": "rgba(47, 47, 47, 0.50)", + "--color-primary-dark-100-alpha-600": "rgba(42, 42, 42, 0.40)", + "--color-primary-alpha-600": "rgba(47, 47, 47, 0.40)", + "--color-primary-dark-100-alpha-700": "rgba(42, 42, 42, 0.30)", + "--color-primary-alpha-700": "rgba(47, 47, 47, 0.30)", + "--color-primary-dark-100-alpha-800": "rgba(42, 42, 42, 0.20)", + "--color-primary-alpha-800": "rgba(47, 47, 47, 0.20)", + "--color-primary-dark-100-alpha-900": "rgba(42, 42, 42, 0.10)", + "--color-primary-alpha-900": "rgba(47, 47, 47, 0.10)", + "--color-primary-dark-200": "rgba(38,38,38, 1)", + "--color-primary-dark-200-alpha-100": "rgba(38, 38, 38, 0.90)", + "--color-primary-dark-200-alpha-200": "rgba(38, 38, 38, 0.80)", + "--color-primary-dark-200-alpha-300": "rgba(38, 38, 38, 0.70)", + "--color-primary-dark-200-alpha-400": "rgba(38, 38, 38, 0.60)", + "--color-primary-dark-200-alpha-500": "rgba(38, 38, 38, 0.50)", + "--color-primary-dark-200-alpha-600": "rgba(38, 38, 38, 0.40)", + "--color-primary-dark-200-alpha-700": "rgba(38, 38, 38, 0.30)", + "--color-primary-dark-200-alpha-800": "rgba(38, 38, 38, 0.20)", + "--color-primary-dark-200-alpha-900": "rgba(38, 38, 38, 0.10)", + "--color-primary-dark-300": "rgba(34,34,34, 1)", + "--color-primary-dark-300-alpha-100": "rgba(34, 34, 34, 0.90)", + "--color-primary-dark-300-alpha-200": "rgba(34, 34, 34, 0.80)", + "--color-primary-dark-300-alpha-300": "rgba(34, 34, 34, 0.70)", + "--color-primary-dark-300-alpha-400": "rgba(34, 34, 34, 0.60)", + "--color-primary-dark-300-alpha-500": "rgba(34, 34, 34, 0.50)", + "--color-primary-dark-300-alpha-600": "rgba(34, 34, 34, 0.40)", + "--color-primary-dark-300-alpha-700": "rgba(34, 34, 34, 0.30)", + "--color-primary-dark-300-alpha-800": "rgba(34, 34, 34, 0.20)", + "--color-primary-dark-300-alpha-900": "rgba(34, 34, 34, 0.10)", + "--color-primary-dark-400": "rgba(31,31,31, 1)", + "--color-primary-dark-400-alpha-100": "rgba(31, 31, 31, 0.90)", + "--color-primary-dark-400-alpha-200": "rgba(31, 31, 31, 0.80)", + "--color-primary-dark-400-alpha-300": "rgba(31, 31, 31, 0.70)", + "--color-primary-dark-400-alpha-400": "rgba(31, 31, 31, 0.60)", + "--color-primary-dark-400-alpha-500": "rgba(31, 31, 31, 0.50)", + "--color-primary-dark-400-alpha-600": "rgba(31, 31, 31, 0.40)", + "--color-primary-dark-400-alpha-700": "rgba(31, 31, 31, 0.30)", + "--color-primary-dark-400-alpha-800": "rgba(31, 31, 31, 0.20)", + "--color-primary-dark-400-alpha-900": "rgba(31, 31, 31, 0.10)", + "--color-primary-dark-500": "rgba(28,28,28, 1)", + "--color-primary-dark-500-alpha-100": "rgba(28, 28, 28, 0.90)", + "--color-primary-dark-500-alpha-200": "rgba(28, 28, 28, 0.80)", + "--color-primary-dark-500-alpha-300": "rgba(28, 28, 28, 0.70)", + "--color-primary-dark-500-alpha-400": "rgba(28, 28, 28, 0.60)", + "--color-primary-dark-500-alpha-500": "rgba(28, 28, 28, 0.50)", + "--color-primary-dark-500-alpha-600": "rgba(28, 28, 28, 0.40)", + "--color-primary-dark-500-alpha-700": "rgba(28, 28, 28, 0.30)", + "--color-primary-dark-500-alpha-800": "rgba(28, 28, 28, 0.20)", + "--color-primary-dark-500-alpha-900": "rgba(28, 28, 28, 0.10)", + "--color-primary-dark-600": "rgba(25,25,25, 1)", + "--color-primary-dark-600-alpha-100": "rgba(25, 25, 25, 0.90)", + "--color-primary-dark-600-alpha-200": "rgba(25, 25, 25, 0.80)", + "--color-primary-dark-600-alpha-300": "rgba(25, 25, 25, 0.70)", + "--color-primary-dark-600-alpha-400": "rgba(25, 25, 25, 0.60)", + "--color-primary-dark-600-alpha-500": "rgba(25, 25, 25, 0.50)", + "--color-primary-dark-600-alpha-600": "rgba(25, 25, 25, 0.40)", + "--color-primary-dark-600-alpha-700": "rgba(25, 25, 25, 0.30)", + "--color-primary-dark-600-alpha-800": "rgba(25, 25, 25, 0.20)", + "--color-primary-dark-600-alpha-900": "rgba(25, 25, 25, 0.10)", + "--color-primary-dark-700": "rgba(23,23,23, 1)", + "--color-primary-dark-700-alpha-100": "rgba(23, 23, 23, 0.90)", + "--color-primary-dark-700-alpha-200": "rgba(23, 23, 23, 0.80)", + "--color-primary-dark-700-alpha-300": "rgba(23, 23, 23, 0.70)", + "--color-primary-dark-700-alpha-400": "rgba(23, 23, 23, 0.60)", + "--color-primary-dark-700-alpha-500": "rgba(23, 23, 23, 0.50)", + "--color-primary-dark-700-alpha-600": "rgba(23, 23, 23, 0.40)", + "--color-primary-dark-700-alpha-700": "rgba(23, 23, 23, 0.30)", + "--color-primary-dark-700-alpha-800": "rgba(23, 23, 23, 0.20)", + "--color-primary-dark-700-alpha-900": "rgba(23, 23, 23, 0.10)", + "--color-primary-dark-800": "rgba(21,21,21, 1)", + "--color-primary-dark-800-alpha-100": "rgba(21, 21, 21, 0.90)", + "--color-primary-dark-800-alpha-200": "rgba(21, 21, 21, 0.80)", + "--color-primary-dark-800-alpha-300": "rgba(21, 21, 21, 0.70)", + "--color-primary-dark-800-alpha-400": "rgba(21, 21, 21, 0.60)", + "--color-primary-dark-800-alpha-500": "rgba(21, 21, 21, 0.50)", + "--color-primary-dark-800-alpha-600": "rgba(21, 21, 21, 0.40)", + "--color-primary-dark-800-alpha-700": "rgba(21, 21, 21, 0.30)", + "--color-primary-dark-800-alpha-800": "rgba(21, 21, 21, 0.20)", + "--color-primary-dark-800-alpha-900": "rgba(21, 21, 21, 0.10)", + "--color-primary-dark-900": "rgba(19,19,19, 1)", + "--color-primary-dark-900-alpha-100": "rgba(19, 19, 19, 0.90)", + "--color-primary-dark-900-alpha-200": "rgba(19, 19, 19, 0.80)", + "--color-primary-dark-900-alpha-300": "rgba(19, 19, 19, 0.70)", + "--color-primary-dark-900-alpha-400": "rgba(19, 19, 19, 0.60)", + "--color-primary-dark-900-alpha-500": "rgba(19, 19, 19, 0.50)", + "--color-primary-dark-900-alpha-600": "rgba(19, 19, 19, 0.40)", + "--color-primary-dark-900-alpha-700": "rgba(19, 19, 19, 0.30)", + "--color-primary-dark-900-alpha-800": "rgba(19, 19, 19, 0.20)", + "--color-primary-dark-900-alpha-900": "rgba(19, 19, 19, 0.10)", + "--color-primary-dark-1000": "rgba(17,17,17, 1)", + "--color-primary-dark-1000-alpha-100": "rgba(17, 17, 17, 0.90)", + "--color-primary-dark-1000-alpha-200": "rgba(17, 17, 17, 0.80)", + "--color-primary-dark-1000-alpha-300": "rgba(17, 17, 17, 0.70)", + "--color-primary-dark-1000-alpha-400": "rgba(17, 17, 17, 0.60)", + "--color-primary-dark-1000-alpha-500": "rgba(17, 17, 17, 0.50)", + "--color-primary-dark-1000-alpha-600": "rgba(17, 17, 17, 0.40)", + "--color-primary-dark-1000-alpha-700": "rgba(17, 17, 17, 0.30)", + "--color-primary-dark-1000-alpha-800": "rgba(17, 17, 17, 0.20)", + "--color-primary-dark-1000-alpha-900": "rgba(17, 17, 17, 0.10)", + "--color-primary-light-100": "rgba(89,89,89, 1)", + "--color-primary-light-100-alpha-100": "rgba(89, 89, 89, 0.90)", + "--color-primary-light-100-alpha-200": "rgba(89, 89, 89, 0.80)", + "--color-primary-light-100-alpha-300": "rgba(89, 89, 89, 0.70)", + "--color-primary-light-100-alpha-400": "rgba(89, 89, 89, 0.60)", + "--color-primary-light-100-alpha-500": "rgba(89, 89, 89, 0.50)", + "--color-primary-light-100-alpha-600": "rgba(89, 89, 89, 0.40)", + "--color-primary-light-100-alpha-700": "rgba(89, 89, 89, 0.30)", + "--color-primary-light-100-alpha-800": "rgba(89, 89, 89, 0.20)", + "--color-primary-light-100-alpha-900": "rgba(89, 89, 89, 0.10)", + "--color-primary-light-200": "rgba(122,122,122, 1)", + "--color-primary-light-200-alpha-100": "rgba(122, 122, 122, 0.90)", + "--color-primary-light-200-alpha-200": "rgba(122, 122, 122, 0.80)", + "--color-primary-light-200-alpha-300": "rgba(122, 122, 122, 0.70)", + "--color-primary-light-200-alpha-400": "rgba(122, 122, 122, 0.60)", + "--color-primary-light-200-alpha-500": "rgba(122, 122, 122, 0.50)", + "--color-primary-light-200-alpha-600": "rgba(122, 122, 122, 0.40)", + "--color-primary-light-200-alpha-700": "rgba(122, 122, 122, 0.30)", + "--color-primary-light-200-alpha-800": "rgba(122, 122, 122, 0.20)", + "--color-primary-light-200-alpha-900": "rgba(122, 122, 122, 0.10)", + "--color-primary-light-300": "rgba(149,149,149, 1)", + "--color-primary-light-300-alpha-100": "rgba(149, 149, 149, 0.90)", + "--color-primary-light-300-alpha-200": "rgba(149, 149, 149, 0.80)", + "--color-primary-light-300-alpha-300": "rgba(149, 149, 149, 0.70)", + "--color-primary-light-300-alpha-400": "rgba(149, 149, 149, 0.60)", + "--color-primary-light-300-alpha-500": "rgba(149, 149, 149, 0.50)", + "--color-primary-light-300-alpha-600": "rgba(149, 149, 149, 0.40)", + "--color-primary-light-300-alpha-700": "rgba(149, 149, 149, 0.30)", + "--color-primary-light-300-alpha-800": "rgba(149, 149, 149, 0.20)", + "--color-primary-light-300-alpha-900": "rgba(149, 149, 149, 0.10)", + "--color-primary-light-400": "rgba(170,170,170, 1)", + "--color-primary-light-400-alpha-100": "rgba(170, 170, 170, 0.90)", + "--color-primary-light-400-alpha-200": "rgba(170, 170, 170, 0.80)", + "--color-primary-light-400-alpha-300": "rgba(170, 170, 170, 0.70)", + "--color-primary-light-400-alpha-400": "rgba(170, 170, 170, 0.60)", + "--color-primary-light-400-alpha-500": "rgba(170, 170, 170, 0.50)", + "--color-primary-light-400-alpha-600": "rgba(170, 170, 170, 0.40)", + "--color-primary-light-400-alpha-700": "rgba(170, 170, 170, 0.30)", + "--color-primary-light-400-alpha-800": "rgba(170, 170, 170, 0.20)", + "--color-primary-light-400-alpha-900": "rgba(170, 170, 170, 0.10)", + "--color-primary-light-500": "rgba(187,187,187, 1)", + "--color-primary-light-500-alpha-100": "rgba(187, 187, 187, 0.90)", + "--color-primary-light-500-alpha-200": "rgba(187, 187, 187, 0.80)", + "--color-primary-light-500-alpha-300": "rgba(187, 187, 187, 0.70)", + "--color-primary-light-500-alpha-400": "rgba(187, 187, 187, 0.60)", + "--color-primary-light-500-alpha-500": "rgba(187, 187, 187, 0.50)", + "--color-primary-light-500-alpha-600": "rgba(187, 187, 187, 0.40)", + "--color-primary-light-500-alpha-700": "rgba(187, 187, 187, 0.30)", + "--color-primary-light-500-alpha-800": "rgba(187, 187, 187, 0.20)", + "--color-primary-light-500-alpha-900": "rgba(187, 187, 187, 0.10)", + "--color-primary-light-600": "rgba(201,201,201, 1)", + "--color-primary-light-600-alpha-100": "rgba(201, 201, 201, 0.90)", + "--color-primary-light-600-alpha-200": "rgba(201, 201, 201, 0.80)", + "--color-primary-light-600-alpha-300": "rgba(201, 201, 201, 0.70)", + "--color-primary-light-600-alpha-400": "rgba(201, 201, 201, 0.60)", + "--color-primary-light-600-alpha-500": "rgba(201, 201, 201, 0.50)", + "--color-primary-light-600-alpha-600": "rgba(201, 201, 201, 0.40)", + "--color-primary-light-600-alpha-700": "rgba(201, 201, 201, 0.30)", + "--color-primary-light-600-alpha-800": "rgba(201, 201, 201, 0.20)", + "--color-primary-light-600-alpha-900": "rgba(201, 201, 201, 0.10)", + "--color-primary-light-700": "rgba(212,212,212, 1)", + "--color-primary-light-700-alpha-100": "rgba(212, 212, 212, 0.90)", + "--color-primary-light-700-alpha-200": "rgba(212, 212, 212, 0.80)", + "--color-primary-light-700-alpha-300": "rgba(212, 212, 212, 0.70)", + "--color-primary-light-700-alpha-400": "rgba(212, 212, 212, 0.60)", + "--color-primary-light-700-alpha-500": "rgba(212, 212, 212, 0.50)", + "--color-primary-light-700-alpha-600": "rgba(212, 212, 212, 0.40)", + "--color-primary-light-700-alpha-700": "rgba(212, 212, 212, 0.30)", + "--color-primary-light-700-alpha-800": "rgba(212, 212, 212, 0.20)", + "--color-primary-light-700-alpha-900": "rgba(212, 212, 212, 0.10)", + "--color-primary-light-800": "rgba(221,221,221, 1)", + "--color-primary-light-800-alpha-100": "rgba(221, 221, 221, 0.90)", + "--color-primary-light-800-alpha-200": "rgba(221, 221, 221, 0.80)", + "--color-primary-light-800-alpha-300": "rgba(221, 221, 221, 0.70)", + "--color-primary-light-800-alpha-400": "rgba(221, 221, 221, 0.60)", + "--color-primary-light-800-alpha-500": "rgba(221, 221, 221, 0.50)", + "--color-primary-light-800-alpha-600": "rgba(221, 221, 221, 0.40)", + "--color-primary-light-800-alpha-700": "rgba(221, 221, 221, 0.30)", + "--color-primary-light-800-alpha-800": "rgba(221, 221, 221, 0.20)", + "--color-primary-light-800-alpha-900": "rgba(221, 221, 221, 0.10)", + "--color-primary-light-900": "rgba(228,228,228, 1)", + "--color-primary-light-900-alpha-100": "rgba(228, 228, 228, 0.90)", + "--color-primary-light-900-alpha-200": "rgba(228, 228, 228, 0.80)", + "--color-primary-light-900-alpha-300": "rgba(228, 228, 228, 0.70)", + "--color-primary-light-900-alpha-400": "rgba(228, 228, 228, 0.60)", + "--color-primary-light-900-alpha-500": "rgba(228, 228, 228, 0.50)", + "--color-primary-light-900-alpha-600": "rgba(228, 228, 228, 0.40)", + "--color-primary-light-900-alpha-700": "rgba(228, 228, 228, 0.30)", + "--color-primary-light-900-alpha-800": "rgba(228, 228, 228, 0.20)", + "--color-primary-light-900-alpha-900": "rgba(228, 228, 228, 0.10)", + "--color-primary-light-1000": "rgba(255,255,255, 1)", + "--color-primary-light-1000-alpha-100": "rgba(255, 255, 255, 0.90)", + "--color-primary-light-1000-alpha-200": "rgba(255, 255, 255, 0.80)", + "--color-primary-light-1000-alpha-300": "rgba(255, 255, 255, 0.70)", + "--color-primary-light-1000-alpha-400": "rgba(255, 255, 255, 0.60)", + "--color-primary-light-1000-alpha-500": "rgba(255, 255, 255, 0.50)", + "--color-primary-light-1000-alpha-600": "rgba(255, 255, 255, 0.40)", + "--color-primary-light-1000-alpha-700": "rgba(255, 255, 255, 0.30)", + "--color-primary-light-1000-alpha-800": "rgba(255, 255, 255, 0.20)", + "--color-primary-light-1000-alpha-900": "rgba(255, 255, 255, 0.10)", + "--color-theme": "rgba(47, 47, 47, 1)" + }, + "extInfo": { + "--color-app-background": "rgba(255, 255, 255, 0)", + "--color-main-background": "rgba(255, 255, 255, 0.8)", + "--color-nav-font": "var(--color-primary)", + "--background-image": "url(./theme_images/china_ink.jpg)", + "--background-image-position": "center", + "--background-image-size": "cover", + "--color-btn-hide": "rgba(183, 212, 208, 1)", + "--color-btn-min": "rgba(200, 214, 183, 1)", + "--color-btn-close": "rgba(218, 195, 188, 1)", + "--color-badge-primary": "rgba(137, 70, 70, 1)", + "--color-badge-secondary": "rgba(67, 139, 65, 1)", + "--color-badge-tertiary": "rgba(132, 135, 65, 1)" + } + } + }, { "id": "happy_new_year", "name": "新年快乐", diff --git a/src/lang/en-us.json b/src/lang/en-us.json index 2d61a295..0c69f395 100644 --- a/src/lang/en-us.json +++ b/src/lang/en-us.json @@ -551,6 +551,7 @@ "theme_pink": "Pink", "theme_purple": "Purple", "theme_red": "Red", + "theme_china_ink": "China Ink", "theme_selector_modal__dark_title": "dark theme", "theme_selector_modal__light_title": "Bright theme", "theme_selector_modal__theme_name": "Topic name", diff --git a/src/lang/zh-cn.json b/src/lang/zh-cn.json index e15af2be..89d4674a 100644 --- a/src/lang/zh-cn.json +++ b/src/lang/zh-cn.json @@ -553,6 +553,7 @@ "theme_pink": "粉装玉琢", "theme_purple": "重斤球紫", "theme_red": "热情似火", + "theme_china_ink": "近墨者黑", "theme_selector_modal__dark_title": "暗色主题", "theme_selector_modal__light_title": "亮色主题", "theme_selector_modal__theme_name": "主题名称", diff --git a/src/lang/zh-tw.json b/src/lang/zh-tw.json index 10a1e7b2..2d9efda8 100644 --- a/src/lang/zh-tw.json +++ b/src/lang/zh-tw.json @@ -551,6 +551,7 @@ "theme_pink": "粉裝玉琢", "theme_purple": "重斤球紫", "theme_red": "熱情似火", + "theme_china_ink": "近墨者黑", "theme_selector_modal__dark_title": "暗色主題", "theme_selector_modal__light_title": "亮色主題", "theme_selector_modal__theme_name": "主題名稱",