diff --git a/.gitignore b/.gitignore index 8fae7b37..272a8cdf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ img/ !templates/Froxlor/ !templates/Sparkle/ -!templates/Sparkl2/ !templates/misc/ templates/Sparkle/assets/css/custom.css vendor/ diff --git a/cache/.keep b/cache/.keep new file mode 100644 index 00000000..e69de29b diff --git a/lib/Froxlor/UI/Panel/UI.php b/lib/Froxlor/UI/Panel/UI.php index 93662b63..c072461a 100644 --- a/lib/Froxlor/UI/Panel/UI.php +++ b/lib/Froxlor/UI/Panel/UI.php @@ -33,7 +33,7 @@ class UI * * @var string */ - private static $default_theme = 'Sparkle2'; + private static $default_theme = 'Froxlor'; private static $install_mode = false; @@ -145,8 +145,8 @@ class UI $theme = self::$default_theme; if (!self::$install_mode) { // system default - if (\Froxlor\Froxlor::DBVERSION <= 201909150) { - \Froxlor\Settings::Set('panel.default_theme', 'Sparkle2'); + if (\Froxlor\Froxlor::DBVERSION <= 202299999) { + \Froxlor\Settings::Set('panel.default_theme', 'Froxlor'); } $theme = (\Froxlor\Settings::Get('panel.default_theme') !== null) ? \Froxlor\Settings::Get('panel.default_theme') : $theme; // customer theme diff --git a/templates/Froxlor/assets/img/logo.png b/templates/Froxlor/assets/img/logo.png new file mode 100644 index 00000000..58ced30f Binary files /dev/null and b/templates/Froxlor/assets/img/logo.png differ diff --git a/templates/Froxlor/assets/img/logo_grey.png b/templates/Froxlor/assets/img/logo_grey.png new file mode 100644 index 00000000..370a8f41 Binary files /dev/null and b/templates/Froxlor/assets/img/logo_grey.png differ