From 8f442b0402fd394974e233a5f69228bd5d4976c2 Mon Sep 17 00:00:00 2001 From: Carsten Schildknecht Date: Mon, 12 Nov 2018 16:11:11 +0100 Subject: [PATCH 1/7] closes #228, closes #127, refs #1 - theming improvements & cleanup --- .gitignore | 6 +- Makefile.release | 2 +- index.html | 4 +- package.json | 5 + src/Phoenix.vue | 4 +- src/default.js | 12 +- src/pages/error.vue | 66 +++--- src/pages/login.vue | 53 +++-- src/store/config.js | 26 +++ themes/owncloud.json | 20 ++ webpack.common.js | 33 ++- yarn.lock | 493 +++++++++++++++++++++++++++++++++++++++++-- 12 files changed, 643 insertions(+), 81 deletions(-) create mode 100644 themes/owncloud.json diff --git a/.gitignore b/.gitignore index 2da572f255f..dc8b282a074 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,9 @@ apps/* !apps/demo !apps/files +themes/* +!themes/owncloud.json + .idea *.bundle.js *.bundle.js.map @@ -18,7 +21,8 @@ apps/* config.json package-lock.json +fonts node_modules build -*.log \ No newline at end of file +*.log diff --git a/Makefile.release b/Makefile.release index e5365f60788..8faa5eef692 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 index.html core/css/uikit.owncloud.css core/js/core.bundle.js node_modules/requirejs/require.js sw.js apps/files/js/files.bundle.js core/gfx/cloud-logo-invert.svg +src_files=README.md CHANGELOG.md LICENSE index.html fonts/* themes/* core/css/core.css core/js/core.bundle.js node_modules/requirejs/require.js sw.js apps/files/js/files.bundle.js core/gfx/cloud-logo-invert.svg src_dirs=appinfo img all_src=$(src_dirs) $(src_files) diff --git a/index.html b/index.html index 3bed1fb1e2d..71ae76fdb4a 100644 --- a/index.html +++ b/index.html @@ -6,9 +6,7 @@ - - - +