diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/App.scss | 7 | ||||
| -rw-r--r-- | src/App.vue | 12 | ||||
| -rw-r--r-- | src/components/timeline/timeline.vue | 7 | ||||
| -rw-r--r-- | 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 index fd5e6c16..ced2d069 100644 --- 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 index e46419e0..2cd6d079 100644 --- 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 index fef96e4e..7de3ffca 100644 --- 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 index 767982c5..eaa5396d 100644 --- 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> |