From cb9c800e5f40ee2714e2702eabfa31af2b469326 Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Wed, 5 Dec 2018 15:13:05 +0300
Subject: [PATCH] Move logo to the left side of top bar

---
 src/App.js   | 3 ++-
 src/App.scss | 8 +++-----
 src/App.vue  | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/App.js b/src/App.js
index 3bfd307f..97e82e7c 100644
--- a/src/App.js
+++ b/src/App.js
@@ -53,7 +53,8 @@ export default {
     },
     logoBgStyle () {
       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 ? {} : {
         'background-color': this.enableMask ? '' : 'transparent'
       })
diff --git a/src/App.scss b/src/App.scss
index fcab3b1c..de87c3de 100644
--- a/src/App.scss
+++ b/src/App.scss
@@ -237,11 +237,9 @@ nav {
 
   .logo {
     display: flex;
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
+    position: relative;
+
+    margin-right: .5em;
 
     align-items: stretch;
     justify-content: center;
diff --git a/src/App.vue b/src/App.vue
index 7716ac39..1a0fe972 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,15 +1,15 @@
 <template>
   <div id="app" v-bind:style="style">
     <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='item'>
           <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>
           </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>
         </div>
         <div class='item right'>