diff --git a/.gitignore b/.gitignore index 11aad601..f5e0d450 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ install/update.log -templates/* lib/userdata.inc.php lib/userdata.inc.php.bak logs/* @@ -13,10 +12,11 @@ logs/* .idea *.iml img/ +vendor/ +node_modules/ +templates/* !templates/Froxlor/ !templates/Sparkle/ -!templates/misc/ templates/Sparkle/assets/css/custom.css -vendor/ -node_modules/ \ No newline at end of file +!templates/misc/ \ No newline at end of file diff --git a/templates/Froxlor/assets/css/main.css b/templates/Froxlor/assets/css/main.css index 17d68549..a2d94086 100644 --- a/templates/Froxlor/assets/css/main.css +++ b/templates/Froxlor/assets/css/main.css @@ -20503,7 +20503,7 @@ readers do not read off random characters that represent icons */ @apply shadow; } .card .card-body { - padding: 1.5rem; + padding: 2rem; } .rounded-corner-tl-bl { diff --git a/templates/Froxlor/assets/img/preview.jpg b/templates/Froxlor/assets/img/preview.jpg new file mode 100644 index 00000000..a03d19ba Binary files /dev/null and b/templates/Froxlor/assets/img/preview.jpg differ diff --git a/templates/Froxlor/assets/js/main.js.LICENSE.txt b/templates/Froxlor/assets/js/main.js.LICENSE.txt index 0fe76a6d..06ed3cb5 100644 --- a/templates/Froxlor/assets/js/main.js.LICENSE.txt +++ b/templates/Froxlor/assets/js/main.js.LICENSE.txt @@ -3,3 +3,28 @@ * Copyright 2011-2021 The Bootstrap Authors (https://github.com/twbs/bootstrap/graphs/contributors) * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE) */ + +/*! + * Sizzle CSS Selector Engine v2.3.6 + * https://sizzlejs.com/ + * + * Copyright JS Foundation and other contributors + * Released under the MIT license + * https://js.foundation/ + * + * Date: 2021-02-16 + */ + +/*! + * jQuery JavaScript Library v3.6.0 + * https://jquery.com/ + * + * Includes Sizzle.js + * https://sizzlejs.com/ + * + * Copyright OpenJS Foundation and other contributors + * Released under the MIT license + * https://jquery.org/license + * + * Date: 2021-03-02T17:08Z + */ diff --git a/templates/Froxlor/base.html.twig b/templates/Froxlor/base.html.twig index 90e5534a..8bb8a3cf 100644 --- a/templates/Froxlor/base.html.twig +++ b/templates/Froxlor/base.html.twig @@ -8,12 +8,10 @@ - {{ theme_css|raw }} {% block custom_css %}{% endblock %} - {{ theme_js|raw }} {% block custom_js %}{% endblock %} Froxlor diff --git a/templates/Froxlor/misc/configurehint.html.twig b/templates/Froxlor/misc/configurehint.html.twig index f7728d86..fcfb30c0 100644 --- a/templates/Froxlor/misc/configurehint.html.twig +++ b/templates/Froxlor/misc/configurehint.html.twig @@ -14,7 +14,7 @@ </div> <div class="col text-white position-relative"> - <img class="h-75 position-absolute bottom-0 end-0 rounded-corner-tl-bl" src="{{ basehref }}templates/Froxlor/assets/img/preview.png"> + <img class="h-75 position-absolute bottom-0 end-0 rounded-corner-tl-bl" src="{{ basehref }}templates/Froxlor/assets/img/preview.jpg"> </div> </div> <div class="mt-5 text-end"> diff --git a/templates/Froxlor/src/scss/main.scss b/templates/Froxlor/src/scss/main.scss index 16524309..7b05d9a9 100644 --- a/templates/Froxlor/src/scss/main.scss +++ b/templates/Froxlor/src/scss/main.scss @@ -13,7 +13,7 @@ @apply shadow; .card-body { - padding: 1.5rem; + padding: 2rem; } }