fix

* mobile-back:
  back button for mobile

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'
       })
@@ -62,6 +63,7 @@ export default {
     style () { return { 'background-image': `url(${this.background})` } },
     sitename () { return this.$store.state.instance.name },
     chat () { return this.$store.state.chat.channel.state === 'joined' },
+    sitenameEnabled () { return this.$store.state.instance.sitenameEnabled },
     suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
     showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel }
   },

src/App.scss

@@ -207,7 +207,7 @@ i[class*=icon-] {
 }
 
 .item {
-  flex: 1;
+  flex: 1 0 auto;
   line-height: 50px;
   height: 50px;
   overflow: hidden;
@@ -220,7 +220,7 @@ i[class*=icon-] {
   }
 
   &.right {
-    justify-content: right;
+    justify-content: flex-end;
     padding-right: 20px;
   }
 }
@@ -237,20 +237,18 @@ 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;
+    justify-content: flex-start;
     flex: 0 0 auto;
     z-index: -1;
 
     .mask {
       mask-repeat: no-repeat;
-      mask-position: center;
+      mask-position: left center;
       mask-size: contain;
       background-color: $fallback--fg;
       background-color: var(--fg, $fallback--fg);
@@ -269,6 +267,10 @@ nav {
     }
   }
 
+  .site-name {
+    display: flex;
+  }
+
   .inner-nav {
     display: flex;
     align-items: center;
@@ -459,9 +461,6 @@ nav {
     .back-button {
       display: none;
     }
-    .site-name {
-      padding-left: 20px;
-    }
   }
 
   .sidebar-bounds {

src/App.vue

@@ -1,16 +1,20 @@
 <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>
-          <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">
+            <div class='logo' :style='logoBgStyle'>
+              <div class='mask' :style='logoMaskStyle'></div>
+              <img :src='logo' :style='logoStyle'>
+            </div>
+            <span v-if="sitenameEnabled" class="site-name_text">
+              {{sitename}}
+            </span>
+          </router-link>
         </div>
         <div class='item right'>
           <user-finder class="nav-icon"></user-finder>

src/boot/after_store.js

@@ -58,6 +58,8 @@ const afterStoreSetup = ({store, i18n}) => {
           var loginMethod = (config.loginMethod)
           var scopeCopy = (config.scopeCopy)
           var subjectLineBehavior = (config.subjectLineBehavior)
+          var alwaysShowSubjectInput = (config.alwaysShowSubjectInput)
+          var sitenameEnabled = (config.sitenameEnabled)
 
           store.dispatch('setInstanceOption', { name: 'theme', value: theme })
           store.dispatch('setInstanceOption', { name: 'background', value: background })
@@ -75,6 +77,8 @@ const afterStoreSetup = ({store, i18n}) => {
           store.dispatch('setInstanceOption', { name: 'loginMethod', value: loginMethod })
           store.dispatch('setInstanceOption', { name: 'scopeCopy', value: scopeCopy })
           store.dispatch('setInstanceOption', { name: 'subjectLineBehavior', value: subjectLineBehavior })
+          store.dispatch('setInstanceOption', { name: 'alwaysShowSubjectInput', value: alwaysShowSubjectInput })
+          store.dispatch('setInstanceOption', { name: 'sitenameEnabled', value: sitenameEnabled })
           if (chatDisabled) {
             store.dispatch('disableChat')
           }

src/modules/instance.js

@@ -25,6 +25,7 @@ const defaultState = {
   scopeCopy: true,
   subjectLineBehavior: 'email',
   loginMethod: 'password',
+  sitenameEnabled: true,
 
   // Nasty stuff
   pleromaBackend: true,

static/config.json

@@ -14,6 +14,7 @@
   "scopeCopy": false,
   "subjectLineBehavior": "email",
   "alwaysShowSubjectInput": true,
+  "sitenameEnabled": true,
   "hidePostStats": false,
   "hideUserStats": false,
   "loginMethod": "password"