From aca25788499102fc7bb88bd1e7d293a20a2c2875 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 14 Dec 2018 10:36:25 +0100 Subject: [PATCH 1/4] Fix logo positions on login screen as well as in the top bar --- src/components/Top-Bar.vue | 4 ++-- src/pages/login.vue | 26 ++++++++++---------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/src/components/Top-Bar.vue b/src/components/Top-Bar.vue index 61775abc3e9..f8582e8662a 100644 --- a/src/components/Top-Bar.vue +++ b/src/components/Top-Bar.vue @@ -7,8 +7,8 @@ + contain + /> {{ configuration.theme.general.name }} diff --git a/src/pages/login.vue b/src/pages/login.vue index c005cf488a9..1a5efdd8457 100644 --- a/src/pages/login.vue +++ b/src/pages/login.vue @@ -1,13 +1,15 @@ @@ -41,11 +42,4 @@ export default { From c809bdf1a2c740a605c2a259a9ea14fb5fb2ef4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 14 Dec 2018 10:44:23 +0100 Subject: [PATCH 2/4] Move owncloud theme assets into themes folder --- Makefile.release | 2 +- themes/owncloud.json | 8 ++++---- {core/gfx => themes/owncloud}/cloud-logo-invert.svg | 0 3 files changed, 5 insertions(+), 5 deletions(-) rename {core/gfx => themes/owncloud}/cloud-logo-invert.svg (100%) diff --git a/Makefile.release b/Makefile.release index b5f02296fb6..bd7177b3072 100644 --- a/Makefile.release +++ b/Makefile.release @@ -10,7 +10,7 @@ endif app_name=phoenix build_dir=$(CURDIR)/build dist_dir=$(build_dir)/dist -src_files=README.md CHANGELOG.md LICENSE manifest.json index.html core/fonts themes/* core/css/core.css core/js/core.bundle.js node_modules/requirejs/require.js apps/files/js/files.bundle.js apps/markdown-editor/js/*.js core/gfx/cloud-logo-invert.svg +src_files=README.md CHANGELOG.md LICENSE manifest.json index.html core/fonts themes/* core/css/core.css core/js/core.bundle.js node_modules/requirejs/require.js apps/files/js/files.bundle.js apps/markdown-editor/js/*.js src_dirs=appinfo img all_src=$(src_dirs) $(src_files) diff --git a/themes/owncloud.json b/themes/owncloud.json index f03676712f5..0262412ad24 100644 --- a/themes/owncloud.json +++ b/themes/owncloud.json @@ -13,8 +13,8 @@ "error": "#F0506E" }, "logo": { - "mini": "core/gfx/cloud-logo-invert.svg", - "small": "core/gfx/cloud-logo-invert.svg", - "big": "core/gfx/cloud-logo-invert.svg" + "mini": "themes/owncloud/cloud-logo-invert.svg", + "small": "themes/owncloud/cloud-logo-invert.svg", + "big": "themes/owncloud/cloud-logo-invert.svg" } -} \ No newline at end of file +} diff --git a/core/gfx/cloud-logo-invert.svg b/themes/owncloud/cloud-logo-invert.svg similarity index 100% rename from core/gfx/cloud-logo-invert.svg rename to themes/owncloud/cloud-logo-invert.svg From bc2baf68535920331fd9fcddf9a0730190063fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 14 Dec 2018 11:21:20 +0100 Subject: [PATCH 3/4] Adding example theme --- themes/example.json | 20 ++++++++++++++++++++ themes/example/logo-icon.svg | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 themes/example.json create mode 100644 themes/example/logo-icon.svg diff --git a/themes/example.json b/themes/example.json new file mode 100644 index 00000000000..931e57239b2 --- /dev/null +++ b/themes/example.json @@ -0,0 +1,20 @@ +{ + "general": { + "name": "Custom Cloud", + "slogan": "Your custom cloud, personalized for you!" + }, + "colors": { + "primary": "#745bca", + "secondary": "#d4778a", + "accent": "#F5F7F9", + "info": "#6A9EFF", + "success": "#32D296", + "warning": "#FAA05A", + "error": "#F0506E" + }, + "logo": { + "mini": "themes/example/logo-icon.svg", + "small": "themes/example/logo-icon.svg", + "big": "themes/example/logo-icon.svg" + } +} diff --git a/themes/example/logo-icon.svg b/themes/example/logo-icon.svg new file mode 100644 index 00000000000..925152145fe --- /dev/null +++ b/themes/example/logo-icon.svg @@ -0,0 +1,2 @@ + + From ec1a43eea4e8d354639c4947cd38b52c8596feef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 14 Dec 2018 14:47:55 +0100 Subject: [PATCH 4/4] Change Demo Url --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b328fabd366..6ff06f689f8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Pushing a new design and frontend concept to ownCloud ![bildschirmfoto von 2018-03-14 17-28-06](https://user-images.githubusercontent.com/1005065/37416039-20817b4c-27ad-11e8-9f14-cbe12936fd64.png) ![bildschirmfoto von 2018-03-14 17-27-40](https://user-images.githubusercontent.com/1005065/37416040-20ad906a-27ad-11e8-8a56-ad5f824743a0.png) -[See this online Demo](http://dev.felix.click/OWC.007.16/0.1.0/) +[See this online Demo](https://phoenix.owncloud.com/custom/phoenix/index.html#/login) ## How to build