Skip to content

Commit 0f8ce71

Browse files
author
Yunyu Lin
committed
Upgrade to Vue 2.4.1, workaround iffy enter animations (see vuejs/vue#6024)
1 parent efc29fa commit 0f8ce71

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/main/resources/main.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
ga('create', 'UA-102278933-1', 'auto');
1414
ga('send', 'pageview');
1515
</script>
16-
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js"></script>
16+
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.4.1/vue.min.js"></script>
1717
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.1.4/js.cookie.min.js"></script>
1818
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/picnic/6.2.5/picnic.min.css">
1919
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:400,600">

src/main/resources/room.html

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
ga('create', 'UA-102278933-1', 'auto');
1313
ga('send', 'pageview');
1414
</script>
15-
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js"></script>
15+
<script src="https://cdnjs.cloudflare.com/ajax/libs/vue/2.4.1/vue.min.js"></script>
1616
<script src="https://cdnjs.cloudflare.com/ajax/libs/dropzone/4.3.0/min/dropzone.min.js"></script>
1717
<script src="https://cdnjs.cloudflare.com/ajax/libs/sockjs-client/1.1.4/sockjs.min.js"></script>
1818
<script src="https://cdnjs.cloudflare.com/ajax/libs/js-cookie/2.1.4/js.cookie.min.js"></script>
@@ -218,33 +218,33 @@
218218
}
219219
}
220220

221-
.grid-entries-enter-active, .grid-entries-leave-active {
222-
transition: all 0.5s;
221+
.grid-entries-enter-to, .grid-entries-leave-active > .card {
222+
transition: all 0.2s;
223223
}
224224

225-
.grid-entries-enter, .grid-entries-leave-active > .card {
225+
.grid-entries-enter, .grid-entries-leave-to > .card {
226226
opacity: 0;
227227
transform: scale(0.25, 0.25);
228228
}
229229

230230
.grid-entries-leave-active {
231231
position: absolute;
232-
z-index: -1
233-
}
234-
235-
.grid-entries-leave-active > .card {
236-
transition: all 0.2s;
232+
z-index: -1;
237233
}
238234

239235
.grid-entries-move {
240236
transition: transform 0.5s ease-in-out;
241237
}
242238

243-
.fade-enter-active, .fade-leave-active {
239+
.fade-enter-active {
244240
transition: opacity .5s;
245241
}
246242

247-
.fade-enter, .fade-leave-active {
243+
.fade-leave-active {
244+
transition: opacity 0.2s;
245+
}
246+
247+
.fade-enter, .fade-leave-to {
248248
opacity: 0;
249249
}
250250

0 commit comments

Comments
 (0)