thibaud-lclr/api-client
1
0
Fork 0
Code Packages Activity Actions

Merge branch 'master' into dependabot/npm_and_yarn/cypress-3.7.0

Browse source
This commit is contained in:
Liyas Thomas 2019-11-30 05:59:25 +05:30 committed by GitHub
commit 0f8adf13ae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
assets/css/styles.scss
View file

@ -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;
}

4
layouts/default.vue
View file

@ -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>