extern/nightTab
1
0
Fork 0
mirror of https://github.com/zombieFox/nightTab.git synced 2025-06-26 04:21:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

[refactor] improve theme font if display and ui font is the same

Browse Source
This commit is contained in:
zombieFox 2020-01-03 11:58:39 -07:00
parent 977f966021
commit ac8b56c838
2 changed files with 59 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/control.js
View File

@ -2563,6 +2563,7 @@ var control = (function() {
type: "text", type: "text",
func: function() { func: function() {
theme.render.font.delay.display(); theme.render.font.delay.display();
theme.render.font.delay.ui();
} }
}, { }, {
element: helper.e(".control-theme-font-display-name-default"), element: helper.e(".control-theme-font-display-name-default"),
@ -2619,6 +2620,7 @@ var control = (function() {
path: "theme.font.ui.name", path: "theme.font.ui.name",
type: "text", type: "text",
func: function() { func: function() {
theme.render.font.delay.display();
theme.render.font.delay.ui(); theme.render.font.delay.ui();
} }
}, { }, {

102
src/js/theme.js
View File

@ -859,31 +859,37 @@ var theme = (function() {
}, },
display: { display: {
name: function() { name: function() {
var name = state.get.current().theme.font.display.name.trim().replace(/\s+/g, "+");
var html = helper.e("html"); var html = helper.e("html");
var link = helper.e(".theme-font-display-name-link"); var removeLink = function() {
if (link) { var link = helper.e(".theme-font-display-name");
link.remove(); if (link) {
link.remove();
};
html.style.removeProperty("--theme-font-display-name");
}; };
html.style.removeProperty("--theme-font-display-name"); var addLink = function() {
if (name != "") { var name = state.get.current().theme.font.display.name.trim().replace(/\s+/g, "+");
var head = helper.e("head"); if (name != "") {
var link = helper.makeNode({ var head = helper.e("head");
tag: "link", var link = helper.makeNode({
attr: [{ tag: "link",
key: "class", attr: [{
value: "theme-font-display-name-link" key: "class",
}, { value: "theme-font-display-name"
key: "href", }, {
value: "https://fonts.googleapis.com/css?family=" + name + ":100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&display=swap" key: "href",
}, { value: "https://fonts.googleapis.com/css?family=" + name + ":100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&display=swap"
key: "rel", }, {
value: "stylesheet" key: "rel",
}] value: "stylesheet"
}); }]
head.appendChild(link); });
html.style.setProperty("--theme-font-display-name", "\"" + state.get.current().theme.font.display.name.trim().replace(/\s\s+/g, " ") + "\"" + ", \"Fjalla One\", sans-serif"); head.appendChild(link);
html.style.setProperty("--theme-font-display-name", "\"" + state.get.current().theme.font.display.name.trim().replace(/\s\s+/g, " ") + "\"" + ", \"Fjalla One\", sans-serif");
};
}; };
removeLink();
addLink();
}, },
weight: function() { weight: function() {
var html = helper.e("html"); var html = helper.e("html");
@ -897,33 +903,39 @@ var theme = (function() {
}, },
ui: { ui: {
name: function() { name: function() {
var name = state.get.current().theme.font.ui.name.trim().replace(/\s+/g, "+");
var html = helper.e("html"); var html = helper.e("html");
var link = helper.eA(".theme-font-ui-name-link"); var removeLink = function() {
if (link.length > 0) { var link = helper.e(".theme-font-ui-name");
link.forEach(function(arrayItem, item) { if (link) {
arrayItem.remove(); link.remove();
}); };
html.style.removeProperty("--theme-font-ui-name"); html.style.removeProperty("--theme-font-ui-name");
}; };
if (name != "") { var addLink = function() {
var head = helper.e("head"); var name = state.get.current().theme.font.ui.name.trim().replace(/\s+/g, "+");
var link = helper.makeNode({ if (name != "") {
tag: "link", if (name != state.get.current().theme.font.display.name) {
attr: [{ var head = helper.e("head");
key: "class", var link = helper.makeNode({
value: "theme-font-ui-name-link" tag: "link",
}, { attr: [{
key: "href", key: "class",
value: "https://fonts.googleapis.com/css?family=" + name + ":100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&display=swap" value: "theme-font-ui-name"
}, { }, {
key: "rel", key: "href",
value: "stylesheet" value: "https://fonts.googleapis.com/css?family=" + name + ":100,100i,200,200i,300,300i,400,400i,500,500i,600,600i,700,700i,800,800i,900,900i&display=swap"
}] }, {
}); key: "rel",
head.appendChild(link); value: "stylesheet"
html.style.setProperty("--theme-font-ui-name", "\"" + state.get.current().theme.font.ui.name.trim().replace(/\s\s+/g, " ") + "\"" + ", \"Open Sans\", sans-serif"); }]
});
head.appendChild(link);
};
html.style.setProperty("--theme-font-ui-name", "\"" + state.get.current().theme.font.ui.name.trim().replace(/\s\s+/g, " ") + "\"" + ", \"Open Sans\", sans-serif");
};
}; };
removeLink();
addLink();
}, },
weight: function() { weight: function() {
var html = helper.e("html"); var html = helper.e("html");