Skip to content

Commit 7324b5d

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 7ea673e + 0f46faa commit 7324b5d

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/v2/guide/transitions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1486,7 +1486,7 @@ Vue.component('my-special-transition', {
14861486
render: function (createElement, context) {
14871487
var data = {
14881488
props: {
1489-
name: 'very-special-transition'
1489+
name: 'very-special-transition',
14901490
mode: 'out-in'
14911491
},
14921492
on: {

themes/vue/source/css/_common.styl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ a.button
158158
display none
159159
box-sizing border-box
160160
max-height "calc(100vh - %s)" % $header-height
161-
overflow-y scroll
161+
overflow-y auto
162162
position absolute
163163
top 100%
164164
right -15px

0 commit comments

Comments
 (0)