From 72d3814970666540a91675221006cf280daf9540 Mon Sep 17 00:00:00 2001 From: Lukas Hirt Date: Mon, 23 Nov 2020 11:38:23 +0100 Subject: [PATCH] Theme redirect page --- changelog/unreleased/theme-redirect | 6 ++++++ changelog/unreleased/update-ods | 6 ++++++ package.json | 2 +- src/pages/accessDenied.vue | 18 +++++++++++++---- src/pages/oidcCallback.vue | 22 ++++++++++++++++----- src/store/config.js | 6 ++++-- themes/owncloud.json | 6 ++++-- themes/owncloud/assets/loginBackground.jpg | Bin 0 -> 88069 bytes yarn.lock | 8 ++++---- 9 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 changelog/unreleased/theme-redirect create mode 100644 changelog/unreleased/update-ods create mode 100644 themes/owncloud/assets/loginBackground.jpg diff --git a/changelog/unreleased/theme-redirect b/changelog/unreleased/theme-redirect new file mode 100644 index 00000000000..4b47377ce43 --- /dev/null +++ b/changelog/unreleased/theme-redirect @@ -0,0 +1,6 @@ +Enhancement: Theme redirect and access denied pages + +We've adjusted the theme on OIDC redirect and access denied pages to use correct logo and background. +We've also added those two values into the theming capabilities. + +https://github.com/owncloud/phoenix/pull/4373 \ No newline at end of file diff --git a/changelog/unreleased/update-ods b/changelog/unreleased/update-ods new file mode 100644 index 00000000000..d08708e292c --- /dev/null +++ b/changelog/unreleased/update-ods @@ -0,0 +1,6 @@ +Enhancement: Update ODS to 2.0.0 + +We've updated the ownCloud design system to version 2.0.0. + +https://github.com/owncloud/owncloud-design-system/releases/tag/v2.0.0 +https://github.com/owncloud/phoenix/pull/4373 \ No newline at end of file diff --git a/package.json b/package.json index 38d11275256..06fb458880d 100644 --- a/package.json +++ b/package.json @@ -98,7 +98,7 @@ "node-fs-extra": "^0.8.2", "npm-run-all": "^4.1.5", "oidc-client": "^1.9.1", - "owncloud-design-system": "^1.15.0", + "owncloud-design-system": "^2.0.0", "owncloud-sdk": "^1.0.0-740", "p-limit": "^2.2.1", "p-queue": "^6.1.1", diff --git a/src/pages/accessDenied.vue b/src/pages/accessDenied.vue index 7c7cf4d803b..8371fd06fc0 100644 --- a/src/pages/accessDenied.vue +++ b/src/pages/accessDenied.vue @@ -1,9 +1,11 @@