Merge branch 'master' into dependabot/npm_and_yarn/vuex-persist-2.2.0
This commit is contained in:
@@ -1,22 +1,14 @@
|
||||
// Layout transitions
|
||||
.page-enter-active,
|
||||
.page-leave-active,
|
||||
.layout-enter-active,
|
||||
.layout-leave-active {
|
||||
transition: opacity 0.5s;
|
||||
}
|
||||
|
||||
.layout-enter,
|
||||
.layout-leave-active {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
// Page transitions
|
||||
.page-enter-active,
|
||||
.page-leave-active {
|
||||
transition: opacity 0.5s;
|
||||
transition: all 0.2s ease-in-out;
|
||||
}
|
||||
|
||||
.page-enter,
|
||||
.page-leave-to {
|
||||
.page-leave-active,
|
||||
.layout-enter,
|
||||
.layout-leave-active {
|
||||
opacity: 0;
|
||||
}
|
||||
|
||||
|
||||
@@ -301,9 +301,7 @@
|
||||
</nav>
|
||||
</div>
|
||||
</aside>
|
||||
<transition name="layout" appear>
|
||||
<nuxt id="main" class="main" />
|
||||
</transition>
|
||||
<nuxt id="main" class="main" />
|
||||
<aside class="nav-second"></aside>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user