From 34bc38f0bf76a9add53652f5a7442be4f7fe9851 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Thu, 16 Feb 2017 22:25:41 +0100
Subject: Add settings page to app.

---
 src/main.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/main.js')

diff --git a/src/main.js b/src/main.js
index 84db5c86..9917ccd9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8,6 +8,7 @@ import FriendsTimeline from './components/friends_timeline/friends_timeline.vue'
 import ConversationPage from './components/conversation-page/conversation-page.vue'
 import Mentions from './components/mentions/mentions.vue'
 import UserProfile from './components/user_profile/user_profile.vue'
+import Settings from './components/settings/settings.vue'
 
 import statusesModule from './modules/statuses.js'
 import usersModule from './modules/users.js'
@@ -48,7 +49,8 @@ const routes = [
   { path: '/main/friends', component: FriendsTimeline },
   { name: 'conversation', path: '/notice/:id', component: ConversationPage },
   { name: 'user-profile', path: '/users/:id', component: UserProfile },
-  { name: 'mentions', path: '/:username/mentions', component: Mentions }
+  { name: 'mentions', path: '/:username/mentions', component: Mentions },
+  { name: 'settings', path: '/settings', component: Settings }
 ]
 
 const router = new VueRouter({
-- 
cgit v1.2.3-70-g09d2


From eb7156de0de7c713a1ac4975838c7081bc3afb39 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Fri, 17 Feb 2017 10:16:29 +0100
Subject: Fix oembed attachments.

---
 src/App.vue                              | 2 +-
 src/components/attachment/attachment.vue | 7 +++++--
 src/main.js                              | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/main.js')

diff --git a/src/App.vue b/src/App.vue
index 7bd79280..d8e1d3e8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
     <nav class='container base01-background base04'>
       <div class='inner-nav' :style="logoStyle">
         <div class='item'>
-          <a route-to='friends-timeline' href="#">{{sitename}}</a>
+          <router-link :to="{ name: 'root'}">{{sitename}}</router-link>
         </div>
         <div class='item right'>
           <router-link :to="{ name: 'settings'}"><i class="icon-cog"></i></router-link>
diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue
index 505182c6..94e88d52 100644
--- a/src/components/attachment/attachment.vue
+++ b/src/components/attachment/attachment.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="attachment">
+  <div class="attachment" :class="type">
     <a class="image-attachment" v-if="hidden" v-on:click.prevent="toggleHidden()">
       <img :key="nsfwImage" :src="nsfwImage"></img>
     </a>
@@ -42,6 +42,10 @@
           margin: 0.2em;
           align-self: flex-start;
 
+          &.html {
+            flex-basis: 100%;
+          }
+
           .hider {
               position: absolute;
               margin: 10px;
@@ -74,7 +78,6 @@
           .oembed {
               img {
                   width: 100%;
-                  height: 100%;
               }
           }
 
diff --git a/src/main.js b/src/main.js
index dfff1444..4b367db9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -44,7 +44,7 @@ const store = new Vuex.Store({
 })
 
 const routes = [
-  { path: '/', redirect: '/main/all' },
+  { name: 'root', path: '/', redirect: '/main/all' },
   { path: '/main/all', component: PublicAndExternalTimeline },
   { path: '/main/public', component: PublicTimeline },
   { path: '/main/friends', component: FriendsTimeline },
-- 
cgit v1.2.3-70-g09d2