diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fbe1f59917..c05e34f4cc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ # This file is a template, and might need editing before it works on your project. # Official framework image. Look for the different tagged releases at: # https://hub.docker.com/r/library/node/tags/ -image: node:6 +image: node:7 before_script: # Install ssh-agent if not already installed, it is required by Docker. @@ -29,12 +29,14 @@ cache: test: script: - - npm install + - npm install -g yarn + - yarn - npm run unit build: script: - - npm install + - npm install -g yarn + - yarn - npm run build artifacts: paths: @@ -45,6 +47,7 @@ deploy: only: - develop script: - - npm install + - npm install -g yarn + - yarn - npm run build - scp -r dist/* pleroma@tenshi.heldscal.la:~/pleroma diff --git a/.node-version b/.node-version new file mode 100644 index 0000000000..b26a34e470 --- /dev/null +++ b/.node-version @@ -0,0 +1 @@ +7.2.1 diff --git a/index.html b/index.html index 52216b1545..668b21bba4 100644 --- a/index.html +++ b/index.html @@ -7,7 +7,7 @@ - +
diff --git a/src/App.js b/src/App.js index 03421c627d..4b0e81d092 100644 --- a/src/App.js +++ b/src/App.js @@ -14,7 +14,11 @@ export default { }), computed: { currentUser () { return this.$store.state.users.currentUser }, - style () { return { 'background-image': `url(${this.currentUser.background_image})` } }, + background () { + return this.currentUser.background_image || this.$store.state.config.background + }, + logoStyle () { return { 'background-image': `url(${this.$store.state.config.logo})` } }, + style () { return { 'background-image': `url(${this.background})` } }, sitename () { return this.$store.state.config.name } }, methods: { diff --git a/src/App.scss b/src/App.scss index e5d4c74f96..b7bbf8ef8a 100644 --- a/src/App.scss +++ b/src/App.scss @@ -63,6 +63,10 @@ nav { align-items: center; flex-basis: 920px; margin: auto; + height: 50px; + background-repeat: no-repeat; + background-position: center; + background-size: contain; } } diff --git a/src/App.vue b/src/App.vue index fc510fda93..7bd79280cc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,7 +1,7 @@