Merge pull request #3783 from owncloud/feature/themeable-sidebar-logo

Add key to theme for sidebar logo
owncloud · Jul 16, 2020 · d067883 · d067883
2 parents ab337ae + 9c2642b
commit d067883
Show file tree

Hide file tree

Showing 24 changed files with 9 additions and 247 deletions.
diff --git a/changelog/unreleased/themeable-logo-in-sidebar b/changelog/unreleased/themeable-logo-in-sidebar
@@ -0,0 +1,6 @@
+Enhancement: Enable changing sidebar logo via theming
+
+We've added a key into the theme which enables using different logo in the sidebar.
+
+https://github.com/owncloud/phoenix/issues/3782
+https://github.com/owncloud/phoenix/pull/3783
diff --git a/src/Phoenix.vue b/src/Phoenix.vue
@@ -121,7 +121,7 @@ export default {
     },
 
     logoImage() {
-      return `/themes/${this.configuration.theme.name}/assets/logo.svg`
+      return this.configuration.theme.logo.sidebar
     },
 
     productName() {

diff --git a/src/store/config.js b/src/store/config.js
@@ -23,6 +23,7 @@ const state = {
       helpDeskLinkText: 'ownCloud Central'
     },
     logo: {
+      sidebar: '',
       favicon: ''
     },
     filesList: {

diff --git a/src/themes/owncloud.less b/src/themes/owncloud.less
diff --git a/src/themes/owncloud/autocomplete.less b/src/themes/owncloud/autocomplete.less
diff --git a/src/themes/owncloud/base.less b/src/themes/owncloud/base.less
diff --git a/src/themes/owncloud/buttons.less b/src/themes/owncloud/buttons.less
diff --git a/src/themes/owncloud/icon-input.less b/src/themes/owncloud/icon-input.less
diff --git a/src/themes/owncloud/label.less b/src/themes/owncloud/label.less
diff --git a/src/themes/owncloud/loader-spinner.less b/src/themes/owncloud/loader-spinner.less
diff --git a/src/themes/owncloud/logo.less b/src/themes/owncloud/logo.less
diff --git a/src/themes/owncloud/main.less b/src/themes/owncloud/main.less
diff --git a/src/themes/owncloud/menu-secondary.less b/src/themes/owncloud/menu-secondary.less
diff --git a/src/themes/owncloud/oc-app-container.less b/src/themes/owncloud/oc-app-container.less
diff --git a/src/themes/owncloud/oc-app-menu.less b/src/themes/owncloud/oc-app-menu.less
diff --git a/src/themes/owncloud/oc-head.less b/src/themes/owncloud/oc-head.less
diff --git a/src/themes/owncloud/oc-public-share-icon.less b/src/themes/owncloud/oc-public-share-icon.less
diff --git a/src/themes/owncloud/oc-shared-item-card.less b/src/themes/owncloud/oc-shared-item-card.less
diff --git a/src/themes/owncloud/oc-user-menu.less b/src/themes/owncloud/oc-user-menu.less
diff --git a/src/themes/owncloud/offcanvas.less b/src/themes/owncloud/offcanvas.less
diff --git a/src/themes/owncloud/text.less b/src/themes/owncloud/text.less
diff --git a/src/themes/owncloud/transitions.less b/src/themes/owncloud/transitions.less
diff --git a/src/themes/owncloud/variables.less b/src/themes/owncloud/variables.less
diff --git a/themes/owncloud.json b/themes/owncloud.json
@@ -4,6 +4,7 @@
     "slogan": "ownCloud – A safe home for all your data"
   },
   "logo": {
+    "sidebar": "themes/owncloud/assets/logo.svg",
     "favicon": "themes/owncloud/favicon.jpg"
   },
   "filesList": {