okseby/orchard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'ciderapp:main' into main

Browse source
This commit is contained in:
Bill Zhang 2022-06-15 15:41:12 +08:00 • committed by GitHub
commit a57d42f922
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/i18n/README.md
View file

@ -448,3 +448,7 @@ Update 10/06/2022 20:00 UTC
* `settings.option.visual.purplePodcastPlaybackBar`: Added to `en_US` * `settings.option.visual.purplePodcastPlaybackBar`: Added to `en_US`
Update 14/06/2022 14:10 UTC
* `term.themeManaged`: Added to `en_US`

1
src/i18n/en_US.json
View file

@ -154,6 +154,7 @@
}, },
"term.videos": "Videos", "term.videos": "Videos",
"term.menu": "Menu", "term.menu": "Menu",
"term.themeManaged": "Managed by a theme",
"term.check": "Check", "term.check": "Check",
"term.aboutArtist": "About {{artistName}}", "term.aboutArtist": "About {{artistName}}",
"term.topResult": "Top Result", "term.topResult": "Top Result",

1
src/i18n/hu_HU.json
View file

@ -154,6 +154,7 @@
}, },
"term.videos": "Videók", "term.videos": "Videók",
"term.menu": "Menü", "term.menu": "Menü",
"term.themeManaged": "Egy téma kezeli a beállítást",
"term.check": "Ellenőrzés", "term.check": "Ellenőrzés",
"term.aboutArtist": "{{artistName}}-ról/ről", "term.aboutArtist": "{{artistName}}-ról/ről",
"term.topResult": "Legjobb találatok", "term.topResult": "Legjobb találatok",

1
src/i18n/source/en_US.json
View file

@ -153,6 +153,7 @@
}, },
"term.videos": "Videos", "term.videos": "Videos",
"term.menu": "Menu", "term.menu": "Menu",
"term.themeManaged": "Managed by a theme",
"term.check": "Check", "term.check": "Check",
"term.aboutArtist": "About {{artistName}}", "term.aboutArtist": "About {{artistName}}",
"term.topResult": "Top Result", "term.topResult": "Top Result",

15
src/renderer/main/vueapp.js
View file

@ -1172,9 +1172,20 @@ const app = new Vue({
}, },
getAppClasses() { getAppClasses() {
let classes = {} let classes = {}
if (this.cfg.advanced.experiments.includes('compactui')) { switch (this.getThemeDirective('forceUI') ?? "none") {
classes.compact = true case "compact":
classes.compact = true;
break;
case "default":
classes.compact = false;
break;
case "none":
if (this.cfg.advanced.experiments.includes('compactui')) {
classes.compact = true;
}
break;
} }
if (this.cfg.visual.window_background_style == "none") { if (this.cfg.visual.window_background_style == "none") {
classes.simplebg = true classes.simplebg = true
} }

13
src/renderer/style.less
View file

@ -1,9 +1,8 @@
@import url("assets/fonts/Pretendard/pretendardvariable.css"); @import url("assets/fonts/Pretendard/pretendardvariable.css");
@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap'); @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+HK:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap"); @import url("https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+TC:wght@100;300;400;500;700;900&display=swap");
@import url("https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@100;300;400;500;700;900&display=swap");
@import url("less/appvars.less"); @import url("less/appvars.less");
@import url("less/bootstrap-vue.min.less"); @import url("less/bootstrap-vue.min.less");
@import url("less/ameframework.less"); @import url("less/ameframework.less");
@ -69,7 +68,7 @@ body {
background-size: cover; background-size: cover;
background-position: center; background-position: center;
background: #0000; background: #0000;
font-family: "Pretendard Variable", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
transition: opacity .10s var(--appleEase); transition: opacity .10s var(--appleEase);
} }
@ -1654,7 +1653,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
overflow-x: hidden; overflow-x: hidden;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
font-family: "Pretendard Variable", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
} }
.lyric-body .no-lyrics { .lyric-body .no-lyrics {
@ -1759,7 +1758,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
.lyrics-translation { .lyrics-translation {
font-size: 1.6rem; font-size: 1.6rem;
font-weight: 450; font-weight: 450;
font-family: "Pretendard Variable", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif; font-family: "Pretendard Variable", "Noto Sans JP", "Noto Sans KR", "Noto Sans TC", "Noto Sans SC", -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
filter: contrast(0.5); filter: contrast(0.5);
} }