diff --git a/Gruntfile.js b/Gruntfile.js index 2c54e99d..04c4c73d 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -61,12 +61,10 @@ module.exports = function(grunt) { }, copy: { - tplcss: { - src: "dist/css/*.min.css", - dest: "template/material/" - }, - tpljs: { - src: "dist/css/*.js", + tpl: { + expand: true, + cwd: "dist/", + src: "**", dest: "template/material/" }, distjs: { diff --git a/dist/css/ripples.css b/dist/css/ripples.css index 14213cd3..c0398792 100644 --- a/dist/css/ripples.css +++ b/dist/css/ripples.css @@ -19,16 +19,22 @@ margin-top: -10px; border-radius: 100%; background-color: rgba(0, 0, 0, 0.05); - transform: scale(1); - transform-origin: 50%; + -webkit-transform: scale(1); + -ms-transform: scale(1); + transform: scale(1); + -webkit-transform-origin: 50%; + -ms-transform-origin: 50%; + transform-origin: 50%; opacity: 0; pointer-events: none; } .ripple.ripple-on { - transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; + -webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; + transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s; opacity: 1; } .ripple.ripple-out { - transition: opacity 0.1s linear 0s !important; + -webkit-transition: opacity 0.1s linear 0s !important; + transition: opacity 0.1s linear 0s !important; opacity: 0; } diff --git a/template/index.html b/template/index.html index 980dfde7..f2d1df7d 100644 --- a/template/index.html +++ b/template/index.html @@ -3,8 +3,8 @@
- - + + @@ -34,8 +34,8 @@ - - + +