Merge branch 'master' into master

This commit is contained in:
Daniel
2021-02-11 14:55:48 +01:00
committed by GitHub
3 changed files with 57 additions and 31 deletions

View File

@@ -453,21 +453,14 @@
//procces google Fonts //procces google Fonts
if(document.getElementById("font-picker") != undefined){ if(document.getElementById("font-picker") != undefined && document.getElementById("font-picker").value != "" ){
var font = document.getElementById("font-picker").value var font = document.getElementById("font-picker").value
var url = "https://fonts.googleapis.com/css?family=" + font; var url = "https://fonts.googleapis.com/css?family=" + font;
var promise = await fetch(url); var promise = await fetch(url,{mode: 'no-cors'});
css += await promise.text(); css += await promise.text();
css += "html {font-family: '$',sans-serif ; } body,h1,h2,h3 { font-family: '$' ,sans-serif;}".replaceAll("$",font.replaceAll("+"," ")); css += "html {font-family: '$',sans-serif ; } body,h1,h2,h3 { font-family: '$' ,sans-serif;}".replaceAll("$",font.replaceAll("+"," "));
return css; return css;
// fetch(url).then(function (response) {
// response.text().then(function (text) {
// css += text;
// return css;
// });
// });
}else{ }else{
return css; return css;
} }
@@ -650,9 +643,9 @@
'<button is="emby-button" type="button" class="raised block" id="refresh-library" onclick=setSkin()><span>Set Skin</span></button>'; '<button is="emby-button" type="button" class="raised block" id="refresh-library" onclick=setSkin()><span>Set Skin</span></button>';
html += loadPreviews(skin); html += loadPreviews(skin);
html += "</div>"; html += "</div>";
$("#options").html(html).trigger("create").then(updateBlurSliders());
$("#options").html(html).trigger("create");
} }

View File

@@ -83,6 +83,17 @@
} }
] ]
}, },
{
"name": "Novachromic",
"author": "EdgeMentality",
"versions":[
{
"name": "Default",
"description": "Novachromic is essentially Monochromic, but with another layer of overrides on top.",
"css" : "@import url('https://ctalvio.github.io/Novachromic/default_style.css');"
}
]
},
{ {
"name": "JellySkin", "name": "JellySkin",
"author": "prayagprajapati17", "author": "prayagprajapati17",

View File

@@ -181,31 +181,53 @@
}, },
{ {
"name": "Novachromic", "name": "Novachromic",
"author": "Casper Talvio", "author": "EdgeMentality",
"description": "Casper's theme for Jellyfin media server, part of the 'chromic' family",' "description": "Novachromic is essentially Monochromic, but with another layer of overrides on top.",
"defaultCss": "@import url('https://ctalvio.github.io/Novachromic/default_style.css');", "defaultCss": "@import url('https://ctalvio.github.io/Novachromic/default_style.css');",
"previews":[ "previews": [
{
"name": "Login Page", {
"url": "" "name": "Home/Index Page",
}, "url": "https://github.com/CTalvio/Novachromic/raw/main/screenshots/one.png"
{ },
"name": "Home/Index Page", {
"url": "https://github.com/CTalvio/Novachromic/blob/main/screenshots/one.png?raw=true" "name": "Library Page",
}, "url": "https://github.com/CTalvio/Novachromic/raw/main/screenshots/six.png"
{ },
"name": "Library Page", {
"url": "https://github.com/CTalvio/Novachromic/blob/main/screenshots/six.png?raw=true" "name": "Title page",
}, "url": "https://github.com/CTalvio/Novachromic/raw/main/screenshots/four.png"
{ },
"name": "Title page", {
"url": "https://github.com/CTalvio/Novachromic/blob/main/screenshots/three.png?raw=true" "name": "Dashboard page",
} "url": "https://github.com/CTalvio/Novachromic/raw/main/screenshots/two.png"
}
], ],
"categories": [ "categories": [
{ {
"name": "Default", "name": "Default",
"options": [] "options": [
{
"type": "checkBox",
"name": "Restore bottom bar style episode progress",
"description": "Don't like my transparent view progress overlay? Use this to go back to the old style.",
"css": "@import url('https://ctalvio.github.io/Monochromic/bottom-progress_style.css');"
},
{
"type": "number",
"name": "Modify rounding",
"description": "Amount of rounding. Zero is none.",
"css": ":root {--rounding: $px;}",
"default": "12"
},
{
"type": "colorPicker",
"name": "Accent color",
"description": "Choose a custom accent color to use with the theme.",
"css": ":root {--accent: $;}",
"default": "#ffffff"
}
]
} }
] ]
}, },