Merge branch 'master' of github.com:Froxlor/Froxlor

This commit is contained in:
Michael Kaufmann
2021-07-13 09:01:25 +02:00
3 changed files with 4 additions and 1 deletions

1
.gitignore vendored
View File

@@ -17,4 +17,5 @@ img/
!templates/Froxlor/
!templates/Sparkle/
!templates/misc/
templates/Sparkle/assets/css/custom.css
vendor/

View File

@@ -0,0 +1 @@
/* To include your custom CSS for this theme, please rename this file to "custom.css" and place your CSS in it */

View File

@@ -2,7 +2,8 @@
"variants": {
"default": {
"css": [
"main.css"
"main.css",
"custom.css"
],
"js": [
"main.js",