Skip to content

Commit dc5af31

Browse files
committed
fix: Ripple fix after latest changes
1 parent ed8c1ea commit dc5af31

File tree

5 files changed

+13
-16
lines changed

5 files changed

+13
-16
lines changed

src/components/card/QCard.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
<template>
22
<div
3-
class="q-card"
3+
class="q-card column"
44
:class="{
55
'no-border-radius': square,
66
'no-shadow': flat,
7-
row: horizontal,
8-
column: !horizontal,
97
inline: inline
108
}"
119
>
@@ -19,7 +17,6 @@ export default {
1917
props: {
2018
square: Boolean,
2119
flat: Boolean,
22-
horizontal: Boolean,
2320
inline: Boolean
2421
}
2522
}

src/components/collapsible/QCollapsible.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
<q-slide-transition>
3232
<div v-show="active">
33-
<div class="q-collapsible-sub-item" :class="{menu: menu}">
33+
<div class="q-collapsible-sub-item" :class="{indent: indent}">
3434
<slot></slot>
3535
</div>
3636
</div>
@@ -59,7 +59,7 @@ export default {
5959
},
6060
props: {
6161
opened: Boolean,
62-
menu: Boolean,
62+
indent: Boolean,
6363
icon: String,
6464
group: String,
6565
img: String,

src/components/collapsible/collapsible.ios.styl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$collapsible-padding ?= 4px 16px
2-
$collapsible-menu-left-padding ?= ($item-primary-size + $item-gutter)
3-
$collapsible-active-color ?= $item-active-color
1+
$collapsible-padding ?= 4px 16px
2+
$collapsible-indent-left-padding ?= ($item-primary-size + $item-gutter)
3+
$collapsible-active-color ?= $item-active-color
44

55
.q-collapsible-sub-item
66
padding $collapsible-padding
7-
&.menu
7+
&.indent
88
padding-left $collapsible-menu-left-padding
99
padding-right 0
1010

src/components/collapsible/collapsible.mat.styl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
$collapsible-padding ?= 4px 16px
2-
$collapsible-menu-left-padding ?= ($item-primary-size + $item-gutter)
3-
$collapsible-active-color ?= $item-active-color
1+
$collapsible-padding ?= 4px 16px
2+
$collapsible-indent-left-padding ?= ($item-primary-size + $item-gutter)
3+
$collapsible-active-color ?= $item-active-color
44

55
.q-collapsible-sub-item
66
padding $collapsible-padding
7-
&.menu
7+
&.indent
88
padding-left $collapsible-menu-left-padding
99
padding-right 0
1010

src/directives/ripple.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export default {
100100
ctx.h = h
101101
el.__qripple = ctx
102102
Object.keys(h).forEach(evt => {
103-
el.addEventListener(evt, ctx[evt], false)
103+
el.addEventListener(evt, h[evt], false)
104104
})
105105
},
106106
update (el, { value, oldValue }) {
@@ -115,7 +115,7 @@ export default {
115115

116116
const ctx = el.__qripple
117117
Object.keys(ctx.h).forEach(evt => {
118-
el.removeEventListener(evt, ctx[evt], false)
118+
el.removeEventListener(evt, ctx.h[evt], false)
119119
})
120120
delete el.__qripple
121121
}

0 commit comments

Comments
 (0)