From fe47cf40da6bec69892dbfb7e78d21ab2379da02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6?= Date: Tue, 26 Apr 2022 09:20:59 +0200 Subject: [PATCH] Dashboard fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ Signed-off-by: nextcloud-command --- apps/dashboard/css/dashboard.scss | 52 -------- .../lib/Service/BackgroundService.php | 1 + .../src/{App.vue => DashboardApp.vue} | 116 +++++++++++------- .../src/components/BackgroundSettings.vue | 4 - apps/dashboard/src/main.js | 4 +- apps/user_status/css/user-status-menu.scss | 8 -- apps/user_status/src/views/Dashboard.vue | 14 ++- apps/weather_status/src/App.vue | 3 - dist/dashboard-main.js | 4 +- dist/dashboard-main.js.map | 2 +- dist/user_status-dashboard.js | 4 +- dist/user_status-dashboard.js.map | 2 +- dist/weather_status-weather-status.js | 4 +- dist/weather_status-weather-status.js.map | 2 +- 14 files changed, 94 insertions(+), 126 deletions(-) rename apps/dashboard/src/{App.vue => DashboardApp.vue} (88%) diff --git a/apps/dashboard/css/dashboard.scss b/apps/dashboard/css/dashboard.scss index aade857464b..f8b8ec24037 100644 --- a/apps/dashboard/css/dashboard.scss +++ b/apps/dashboard/css/dashboard.scss @@ -54,55 +54,3 @@ #appmenu li a:focus::before { display: none !important; } - -$has-custom-logo: variable_exists('theming-logo-mime') and $theming-logo-mime != ''; - -body.dashboard--inverted:not(.dashboard--dark) { - // Do not invert the default logo - @if ($has-custom-logo == false) { - $image-logo: url(icon-color-path('logo', 'logo', #ffffff, 1, true)); - #header .logo { - background-image: $image-logo !important; - opacity: 1; - } - } - - #app-dashboard > h2 { - color: #fff; - } - #appmenu li span { - color: #fff; - } - #appmenu svg image { - filter: invert(0); - } - #appmenu .icon-more-white, - .header-right > div:not(#settings) > *:first-child { - filter: invert(1) hue-rotate(180deg); - } -} - -body.dashboard--dark:not(.dashboard--inverted) { - // invert the default logo - @if ($has-custom-logo == false) { - $image-logo: url(icon-color-path('logo', 'logo', #000000, 1, true)); - #header .logo { - background-image: $image-logo !important; - opacity: 1; - } - } - - #app-dashboard > h2 { - color: #000; - } - #appmenu li span { - color: #000; - } - #appmenu svg { - filter: invert(1) hue-rotate(180deg) !important; - } - #appmenu .icon-more-white, - .header-right > div:not(#settings) > *:first-child { - filter: invert(1) hue-rotate(180deg) !important; - } -} diff --git a/apps/dashboard/lib/Service/BackgroundService.php b/apps/dashboard/lib/Service/BackgroundService.php index f9bd987bdca..13ad03cf860 100644 --- a/apps/dashboard/lib/Service/BackgroundService.php +++ b/apps/dashboard/lib/Service/BackgroundService.php @@ -40,6 +40,7 @@ use OCP\Lock\LockedException; use OCP\PreConditionNotMetException; class BackgroundService { + // true when the background is bright and need dark icons public const THEMING_MODE_DARK = 'dark'; public const SHIPPED_BACKGROUNDS = [ diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/DashboardApp.vue similarity index 88% rename from apps/dashboard/src/App.vue rename to apps/dashboard/src/DashboardApp.vue index e8a1933287a..46de7b58827 100644 --- a/apps/dashboard/src/App.vue +++ b/apps/dashboard/src/DashboardApp.vue @@ -16,7 +16,8 @@ @end="saveLayout">
-

+

+
{{ panels[panelId].title }}

@@ -27,24 +28,26 @@