Skip to content

Commit 7c47cca

Browse files
fix(MdCard): fix some theme errors and glitches
1 parent 125ebb4 commit 7c47cca

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

src/components/MdCard/MdCardContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
font-size: 14px;
1717
line-height: 22px;
1818
19-
&:last-child {
19+
&:last-of-type {
2020
padding-bottom: 24px;
2121
}
2222
}

src/components/MdCard/MdCardExpandContent.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
.md-card-expand-content {
4444
overflow: hidden;
4545
transform: translate3D(0, 0, 0);
46-
transition: .4s $md-transition-stand-timing;
46+
transition: .4s $md-transition-default-timing;
4747
transition-property: opacity, margin-top;
4848
will-change: opacity, margin-top;
4949
}

src/components/MdCard/theme.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
@include md-theme-property(background-color, $base);
33
@include md-theme-property(color, text-primary, $base);
44

5-
.md-card-actions {
5+
.md-card-expand .md-card-actions {
66
@include md-theme-property(background-color, $base);
77
}
88

src/material.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import MdReactive from 'core/MdReactive'
22
import MdTheme from 'core/MdTheme'
33

44
const material = new MdReactive({
5-
inkRipple: true,
5+
ripple: true,
66
theming: {},
77
locale: {
88
startYear: 1900,

yarn.lock

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,8 +1728,8 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
17281728
sha.js "^2.4.8"
17291729

17301730
cross-env@^5.0.4:
1731-
version "5.0.4"
1732-
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.4.tgz#af93f5ce541ca9de49250b988104112e31c22563"
1731+
version "5.0.5"
1732+
resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.0.5.tgz#4383d364d9660873dd185b398af3bfef5efffef3"
17331733
dependencies:
17341734
cross-spawn "^5.1.0"
17351735
is-windows "^1.0.0"
@@ -1949,7 +1949,13 @@ de-indent@^1.0.2:
19491949
version "1.0.2"
19501950
resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
19511951

1952-
debug@*, debug@2, debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.4.5, debug@^2.6.0, debug@^2.6.3, debug@^2.6.8:
1952+
debug@*:
1953+
version "3.0.0"
1954+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.0.0.tgz#1d2feae53349047b08b264ec41906ba17a8516e4"
1955+
dependencies:
1956+
ms "2.0.0"
1957+
1958+
debug@2, debug@2.6.8, debug@^2.1.1, debug@^2.2.0, debug@^2.4.5, debug@^2.6.0, debug@^2.6.3, debug@^2.6.8:
19531959
version "2.6.8"
19541960
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.8.tgz#e731531ca2ede27d188222427da17821d68ff4fc"
19551961
dependencies:
@@ -4367,14 +4373,18 @@ minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3, minimatch@^3.0.4, minimatc
43674373
dependencies:
43684374
brace-expansion "^1.1.7"
43694375

4370-
minimist@0.0.8, minimist@~0.0.1:
4376+
minimist@0.0.8:
43714377
version "0.0.8"
43724378
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
43734379

43744380
minimist@1.2.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0:
43754381
version "1.2.0"
43764382
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
43774383

4384+
minimist@~0.0.1:
4385+
version "0.0.10"
4386+
resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
4387+
43784388
mixin-object@^2.0.1:
43794389
version "2.0.1"
43804390
resolved "https://registry.yarnpkg.com/mixin-object/-/mixin-object-2.0.1.tgz#4fb949441dab182540f1fe035ba60e1947a5e57e"
@@ -6031,8 +6041,8 @@ signal-exit@^3.0.0, signal-exit@^3.0.2:
60316041
resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
60326042

60336043
sinon@^3.0.0:
6034-
version "3.0.0"
6035-
resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.0.0.tgz#f6919755c8c705e0b4ae977e8351bbcbaf6d91de"
6044+
version "3.1.0"
6045+
resolved "https://registry.yarnpkg.com/sinon/-/sinon-3.1.0.tgz#c2b6e58e178fe85afe24f0182828a0060e0df383"
60366046
dependencies:
60376047
diff "^3.1.0"
60386048
formatio "1.2.0"
@@ -6877,10 +6887,14 @@ word-wrap@^1.0.3:
68776887
version "1.2.3"
68786888
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
68796889

6880-
wordwrap@0.0.2, wordwrap@~0.0.2:
6890+
wordwrap@0.0.2:
68816891
version "0.0.2"
68826892
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
68836893

6894+
wordwrap@~0.0.2:
6895+
version "0.0.3"
6896+
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
6897+
68846898
wordwrap@~1.0.0:
68856899
version "1.0.0"
68866900
resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"

0 commit comments

Comments
 (0)