diff --git a/src/i18n/README.md b/src/i18n/README.md index a21bf49e..2d079f34 100644 --- a/src/i18n/README.md +++ b/src/i18n/README.md @@ -448,3 +448,7 @@ Update 10/06/2022 20:00 UTC * `settings.option.visual.purplePodcastPlaybackBar`: Added to `en_US` +Update 14/06/2022 14:10 UTC + +* `term.themeManaged`: Added to `en_US` + diff --git a/src/i18n/en_US.json b/src/i18n/en_US.json index 692e86c2..c92b3e51 100644 --- a/src/i18n/en_US.json +++ b/src/i18n/en_US.json @@ -154,6 +154,7 @@ }, "term.videos": "Videos", "term.menu": "Menu", + "term.themeManaged": "Managed by a theme", "term.check": "Check", "term.aboutArtist": "About {{artistName}}", "term.topResult": "Top Result", diff --git a/src/i18n/hu_HU.json b/src/i18n/hu_HU.json index c38d44ab..5c131b8c 100644 --- a/src/i18n/hu_HU.json +++ b/src/i18n/hu_HU.json @@ -154,6 +154,7 @@ }, "term.videos": "Videók", "term.menu": "Menü", + "term.themeManaged": "Egy téma kezeli a beállítást", "term.check": "Ellenőrzés", "term.aboutArtist": "{{artistName}}-ról/ről", "term.topResult": "Legjobb találatok", diff --git a/src/i18n/source/en_US.json b/src/i18n/source/en_US.json index e202b0bf..ee5beeff 100644 --- a/src/i18n/source/en_US.json +++ b/src/i18n/source/en_US.json @@ -153,6 +153,7 @@ }, "term.videos": "Videos", "term.menu": "Menu", + "term.themeManaged": "Managed by a theme", "term.check": "Check", "term.aboutArtist": "About {{artistName}}", "term.topResult": "Top Result", diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 94a39304..660467d2 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -1172,9 +1172,20 @@ const app = new Vue({ }, getAppClasses() { let classes = {} - if (this.cfg.advanced.experiments.includes('compactui')) { - classes.compact = true + switch (this.getThemeDirective('forceUI') ?? "none") { + 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") { classes.simplebg = true } diff --git a/src/renderer/style.less b/src/renderer/style.less index 200735f0..443837a2 100644 --- a/src/renderer/style.less +++ b/src/renderer/style.less @@ -1,9 +1,8 @@ @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+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+JP: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/bootstrap-vue.min.less"); @import url("less/ameframework.less"); @@ -69,7 +68,7 @@ body { background-size: cover; background-position: center; 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); } @@ -1654,7 +1653,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { overflow-x: hidden; display: flex; 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 { @@ -1759,7 +1758,7 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb { .lyrics-translation { font-size: 1.6rem; 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); }