pleroma-fe

commit: 187c4a7d57fa359abc954b4fa9c570635fa149fd
parent: 6e608dd2dd5a9d28c384b7fb368e76c477685ffd
Author: Roger Braun <roger@rogerbraun.net>
Date:   Fri,  2 Dec 2016 14:33:03 +0100

CSS fixes.

Diffstat:
M
src/App.scss
7
++++++-
M
src/App.vue
12
+++++++-----
M
src/components/timeline/timeline.vue
7
-------
M
src/components/user_profile/user_profile.vue
7
-------

4 files changed, 13 insertions(+), 20 deletions(-)
diff --git a/src/App.scss b/src/App.scss
@@ -63,7 +63,7 @@ nav {
 
 }
 
-sidebar {
+.sidebar {
     flex: 1;
     flex-basis: 300px;
 }
@@ -255,3 +255,8 @@ nav {
 .fade-enter, .fade-leave-active {
   opacity: 0
 }
+
+.main {
+    flex: 2;
+    flex-basis: 500px;
+}
diff --git a/src/App.vue b/src/App.vue
@@ -6,14 +6,16 @@
       </div>
     </nav>
     <div class="container" id="content">
-      <sidebar>
+      <div class="sidebar">
         <user-panel></user-panel>
         <nav-panel></nav-panel>
         <notifications v-if="currentUser"></notifications>
-      </sidebar>
-      <transition name="fade">
-        <router-view></router-view>
-      </transition>
+      </div>
+      <div class="main">
+        <transition name="fade">
+          <router-view></router-view>
+        </transition>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
@@ -18,10 +18,3 @@
   </div>
 </template>
 <script src="./timeline.js"></script>
-
-<style>
- .timeline.panel {
-     flex: 2;
-     flex-basis: 500px;
- }
-</style>
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
@@ -5,10 +5,3 @@
 </template>
 
 <script src="./user_profile.js"></script>
-
-<style>
- .user-profile {
-   flex: 2;
-   flex-basis: 500px;
- }
-</style>