Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma-fe into develop

2017-02-16 22:27:10 +01:00 · 2017-02-16 22:27:10 +01:00 · 0be2051588
commit 0be2051588
parent 34bc38f0bf ce5b3d4c92
17 changed files with 74 additions and 18 deletions
--- a/src/App.vue
+++ b/src/App.vue
@ -1,7 +1,7 @@
 <template>
  <div id="app" v-bind:style="style" class="base02-background">
    <nav class='container base01-background base04'>
-      <div class='inner-nav'>
+      <div class='inner-nav' :style="logoStyle">
        <div class='item'>
          <a route-to='friends-timeline' href="#">{{sitename}}</a>
        </div>