CSS fixes.

This commit is contained in:
Roger Braun 2016-12-02 14:33:03 +01:00
parent 6e608dd2dd
commit 187c4a7d57
4 changed files with 13 additions and 20 deletions

View File

@ -63,7 +63,7 @@ nav {
} }
sidebar { .sidebar {
flex: 1; flex: 1;
flex-basis: 300px; flex-basis: 300px;
} }
@ -255,3 +255,8 @@ nav {
.fade-enter, .fade-leave-active { .fade-enter, .fade-leave-active {
opacity: 0 opacity: 0
} }
.main {
flex: 2;
flex-basis: 500px;
}

View File

@ -6,14 +6,16 @@
</div> </div>
</nav> </nav>
<div class="container" id="content"> <div class="container" id="content">
<sidebar> <div class="sidebar">
<user-panel></user-panel> <user-panel></user-panel>
<nav-panel></nav-panel> <nav-panel></nav-panel>
<notifications v-if="currentUser"></notifications> <notifications v-if="currentUser"></notifications>
</sidebar> </div>
<transition name="fade"> <div class="main">
<router-view></router-view> <transition name="fade">
</transition> <router-view></router-view>
</transition>
</div>
</div> </div>
</div> </div>
</template> </template>

View File

@ -18,10 +18,3 @@
</div> </div>
</template> </template>
<script src="./timeline.js"></script> <script src="./timeline.js"></script>
<style>
.timeline.panel {
flex: 2;
flex-basis: 500px;
}
</style>

View File

@ -5,10 +5,3 @@
</template> </template>
<script src="./user_profile.js"></script> <script src="./user_profile.js"></script>
<style>
.user-profile {
flex: 2;
flex-basis: 500px;
}
</style>