|
@@ -1,11 +1,11 @@
|
|
<template>
|
|
<template>
|
|
- <section class="app-main">
|
|
|
|
|
|
+ <div class="app-main">
|
|
<transition name="fade-transform" mode="out-in">
|
|
<transition name="fade-transform" mode="out-in">
|
|
<keep-alive :include="cachedViews">
|
|
<keep-alive :include="cachedViews">
|
|
<router-view :key="key" />
|
|
<router-view :key="key" />
|
|
</keep-alive>
|
|
</keep-alive>
|
|
</transition>
|
|
</transition>
|
|
- </section>
|
|
|
|
|
|
+ </div>
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
@@ -32,47 +32,43 @@ export default {
|
|
@import "~@/styles/sidebar.scss";
|
|
@import "~@/styles/sidebar.scss";
|
|
@import "~@/styles/btn.scss";
|
|
@import "~@/styles/btn.scss";
|
|
.app-main {
|
|
.app-main {
|
|
- /* 50= navbar 50 */
|
|
|
|
|
|
+ // min-height: calc(100vh - 50px);
|
|
min-height: 100%;
|
|
min-height: 100%;
|
|
//calc(100vh - 50px);
|
|
//calc(100vh - 50px);
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 100%;
|
|
height: 100%;
|
|
- position: relative;
|
|
|
|
- overflow: scroll;
|
|
|
|
- padding: 0 0 0 0;
|
|
|
|
|
|
+ position: fixed;
|
|
|
|
+ // overflow: scroll;
|
|
|
|
+ padding: 50px 0 0 0;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
- @include scrollBar();
|
|
|
|
|
|
+ // @include scrollBar();
|
|
}
|
|
}
|
|
|
|
|
|
.fixed-header + .app-main {
|
|
.fixed-header + .app-main {
|
|
-
|
|
|
|
// min-height: calc(100vh - 50px);
|
|
// min-height: calc(100vh - 50px);
|
|
min-height: 100%;
|
|
min-height: 100%;
|
|
//calc(100vh - 50px);
|
|
//calc(100vh - 50px);
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 100%;
|
|
height: 100%;
|
|
- position: relative;
|
|
|
|
- overflow: scroll;
|
|
|
|
- padding: 0 0 0 0;
|
|
|
|
- padding-top: 50px;
|
|
|
|
|
|
+ position: fixed;
|
|
|
|
+ // overflow: scroll;
|
|
|
|
+ padding: 50px 0 0 0;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
- @include scrollBar();
|
|
|
|
|
|
+ // @include scrollBar();
|
|
}
|
|
}
|
|
|
|
|
|
.hasTagsView {
|
|
.hasTagsView {
|
|
.app-main {
|
|
.app-main {
|
|
- /* 84 = navbar + tags-view = 50 + 34 */
|
|
|
|
- min-height: 100%;
|
|
|
|
|
|
+ // min-height: calc(100vh - 50px);
|
|
min-height: 100%;
|
|
min-height: 100%;
|
|
//calc(100vh - 50px);
|
|
//calc(100vh - 50px);
|
|
width: 100%;
|
|
width: 100%;
|
|
height: 100%;
|
|
height: 100%;
|
|
- position: relative;
|
|
|
|
- overflow: scroll;
|
|
|
|
- padding: 0 0 0 0;
|
|
|
|
|
|
+ position: fixed;
|
|
|
|
+ // overflow: scroll;
|
|
|
|
+ padding: 50px 0 0 0;
|
|
box-sizing: border-box;
|
|
box-sizing: border-box;
|
|
- padding-top: 50px;
|
|
|
|
- @include scrollBar();
|
|
|
|
|
|
+ // @include scrollBar();
|
|
}
|
|
}
|
|
|
|
|
|
// .fixed-header+.app-main {
|
|
// .fixed-header+.app-main {
|