Feature/fix logo and themes

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)
 

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
 

src/components/Top-Bar.vue

@@ -7,8 +7,8 @@
  <v-img
  v-if="configuration.theme.logo.big"
  :src="configuration.theme.logo.big"
- :aspect-ratio="1.8"
-  width="60%"/>
+ contain
+ />
  </v-flex>
  <span class="font-weight-medium title">{{ configuration.theme.general.name }}</span>
  <v-spacer></v-spacer>

src/pages/login.vue

@@ -1,13 +1,15 @@
 <template>
  <div>
  <v-layout class="background primary">
- <v-flex class="pa-0" xs12>
+ <v-flex class="pa-0" xs12 style="height: 100vh">
  <v-img
- v-if="configuration.theme.logo.big"
- :src="configuration.theme.logo.big"
- :aspect-ratio="1"
- height="100vh">
- <v-flex class="center-dialog grey lighten-2 pa-4 ml-auto mr-auto elevation-5" md4 xs8>
+ v-if="configuration.theme.logo.big"
+ :src="configuration.theme.logo.big"
+ max-height="40%"
+ height="40%"
+ contain
+ ></v-img>
+ <v-flex class="center-dialog grey lighten-2 pa-4 ml-auto mr-auto elevation-5" md4 xs8>
  <h2>
  <span v-translate>Welcome to</span> {{ configuration.theme.general.name }}
  </h2>
@@ -16,9 +18,8 @@
  </v-flex>
  <v-btn color="primary" id="authenticate" @click="login()"><span v-translate>Authenticate</span></v-btn>
  </v-flex>
- </v-img>
- </v-flex>
- </v-layout>
+ </v-flex>
+ </v-layout>
  </div>
 </template>
 
@@ -41,11 +42,4 @@ export default {
 </script>
 
 <style>
- .v-btn, h2, .flex{
- padding: 8px 8px;
- }
- .center-dialog {
- /* FIXME: use justify-center and align-center */
- margin-top: 32vh!important;
- }
 </style>

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"
+ }
+}

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"
  }
-}
+}