1
0
mirror of https://github.com/gilbN/theme.park.git synced 2024-11-04 10:12:31 +01:00

Merge branch 'develop' into testing

This commit is contained in:
GilbN 2022-04-01 22:29:45 +02:00
commit b25c964940
2 changed files with 10 additions and 7 deletions

View File

@ -218,7 +218,8 @@ select,
}
/* Buttons */
.btn-dark {
.btn-dark,
.btn-dark.inactive:hover {
background-color: var(--button-color);
border-color: var(--button-color);
color: var(--button-text);
@ -231,6 +232,7 @@ select,
}
.btn-dark:active,
.btn-dark:active:hover,
.btn-dark.active,
.open>.dropdown-toggle.btn-dark,
.btn-dark.active:focus {
@ -239,6 +241,11 @@ select,
border-color: var(--button-color-hover);
}
.btn-filter.active, .btn-filter.active.focus,
.btn-filter.active:hover {
background-color: var(--button-color-hover) !important;
}
.btn:focus:not(select),
.btn.focus:not(select),
.btn-dark:focus:not(select),
@ -252,10 +259,6 @@ select,
background-color: var(--button-color-hover);
}
.btn-dark.inactive:hover {
background-color: rgba(255, 255, 255, 0.08);
}
.btn-danger.btn-edit {
background-color: rgba(255, 255, 255, 0.25);
}

View File

@ -56,7 +56,7 @@ function injectTheme(theme,container="head") {
} else html_element = document.body;
let themeOption = document.getElementById("theme-option")
let link = themeOption ? themeOption : document.createElement("link");
url = "/css/theme-options"
url = `${window.location.pathname}css/theme-options`
link.type = "text/css";
link.rel = "stylesheet";
link.href = `${url}/${themeLower}.css`;
@ -145,7 +145,7 @@ function fadeOutIn(speed) {
}
function updateMetaThemeColor() {
fetch(`/css/theme-options/${Object.keys(themeOptions)[currentIndex].toLowerCase()}.css`)
fetch(`${window.location.pathname}css/theme-options/${Object.keys(themeOptions)[currentIndex].toLowerCase()}.css`)
.then(response => response.text())
.then(text => {
let re = text.match("--accent-color:.*;")[0]