Skip to content

Commit 4964878

Browse files
author
FezVrasta
committed
refactor of example template to reflect dist changes
1 parent 41c94a2 commit 4964878

21 files changed

Lines changed: 10041 additions & 17 deletions

Gruntfile.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,10 @@ module.exports = function(grunt) {
6161
},
6262

6363
copy: {
64-
tplcss: {
65-
src: "dist/css/*.min.css",
66-
dest: "template/material/"
67-
},
68-
tpljs: {
69-
src: "dist/css/*.js",
64+
tpl: {
65+
expand: true,
66+
cwd: "dist/",
67+
src: "**",
7068
dest: "template/material/"
7169
},
7270
distjs: {

dist/css/ripples.css

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,22 @@
1919
margin-top: -10px;
2020
border-radius: 100%;
2121
background-color: rgba(0, 0, 0, 0.05);
22-
transform: scale(1);
23-
transform-origin: 50%;
22+
-webkit-transform: scale(1);
23+
-ms-transform: scale(1);
24+
transform: scale(1);
25+
-webkit-transform-origin: 50%;
26+
-ms-transform-origin: 50%;
27+
transform-origin: 50%;
2428
opacity: 0;
2529
pointer-events: none;
2630
}
2731
.ripple.ripple-on {
28-
transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
32+
-webkit-transition: opacity 0.15s ease-in 0s, -webkit-transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
33+
transition: opacity 0.15s ease-in 0s, transform 0.5s cubic-bezier(0.4, 0, 0.2, 1) 0.1s;
2934
opacity: 1;
3035
}
3136
.ripple.ripple-out {
32-
transition: opacity 0.1s linear 0s !important;
37+
-webkit-transition: opacity 0.1s linear 0s !important;
38+
transition: opacity 0.1s linear 0s !important;
3339
opacity: 0;
3440
}

template/index.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<head>
44

55
<link href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css" rel="stylesheet">
6-
<link href="material/css-compiled/ripples.min.css" rel="stylesheet">
7-
<link href="material/css-compiled/material-wfont.min.css" rel="stylesheet">
6+
<link href="material/css/ripples.min.css" rel="stylesheet">
7+
<link href="material/css/material-wfont.min.css" rel="stylesheet">
88

99
</head>
1010

@@ -34,8 +34,8 @@ <h3 class="text-muted">If you can see the ripple effect on clicking them, then y
3434
<script src="//code.jquery.com/jquery-1.10.2.min.js"></script>
3535
<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js"></script>
3636

37-
<script src="material/scripts/ripples.js"></script>
38-
<script src="material/scripts/material.js"></script>
37+
<script src="material/js/ripples.min.js"></script>
38+
<script src="material/js/material.min.js"></script>
3939

4040
</body>
4141

template/material/css-compiled/material-wfont.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

template/material/css-compiled/material.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

template/material/css-compiled/ripples.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)