moon
/
pleroma-fe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move logo to the left side of top bar

This commit is contained in:
Henry Jameson 2018-12-05 15:13:05 +03:00
parent 111821ca3e
commit cb9c800e5f
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/App.js
View File

@ -53,7 +53,8 @@ export default {
}, },
logoBgStyle () { logoBgStyle () {
return Object.assign({ return Object.assign({
'margin': `${this.$store.state.instance.logoMargin} 0` 'margin-top': `${this.$store.state.instance.logoMargin}`,
'margin-bottom': `${this.$store.state.instance.logoMargin}`
}, this.enableMask ? {} : { }, this.enableMask ? {} : {
'background-color': this.enableMask ? '' : 'transparent' 'background-color': this.enableMask ? '' : 'transparent'
}) })

8
src/App.scss
View File

@ -237,11 +237,9 @@ nav {
.logo { .logo {
display: flex; display: flex;
position: absolute; position: relative;
top: 0;
bottom: 0; margin-right: .5em;
left: 0;
right: 0;
align-items: stretch; align-items: stretch;
justify-content: center; justify-content: center;

8
src/App.vue
View File

@ -1,15 +1,15 @@
<template> <template>
<div id="app" v-bind:style="style"> <div id="app" v-bind:style="style">
<nav class='container' @click="scrollToTop()" id="nav"> <nav class='container' @click="scrollToTop()" id="nav">
<div class='logo' :style='logoBgStyle'>
<div class='mask' :style='logoMaskStyle'></div>
<img :src='logo' :style='logoStyle'>
</div>
<div class='inner-nav'> <div class='inner-nav'>
<div class='item'> <div class='item'>
<router-link class="back-button" @click.native="activatePanel('timeline')" :to="{ name: 'root' }" active-class="hidden"> <router-link class="back-button" @click.native="activatePanel('timeline')" :to="{ name: 'root' }" active-class="hidden">
<i class="icon-left-open" :title="$t('nav.back')"></i> <i class="icon-left-open" :title="$t('nav.back')"></i>
</router-link> </router-link>
<div class='logo' :style='logoBgStyle'>
<div class='mask' :style='logoMaskStyle'></div>
<img :src='logo' :style='logoStyle'>
</div>
<router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link> <router-link class="site-name" :to="{ name: 'root' }" active-class="home">{{sitename}}</router-link>
</div> </div>
<div class='item right'> <div class='item right'>