Skip to content

Commit

Permalink
path and build stuff fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
mattybow committed Oct 31, 2014
1 parent 9e33c6e commit 9363cc0
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 12 deletions.
14 changes: 11 additions & 3 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,17 @@ module.exports = function(grunt) {
},
copy:{
main:{
files:[
{expand:true, cwd:'src/', src:['gfy-cat/**','playpause-svg/**','!**/*.scss'], dest:'dist/'}
]
flatten:true,
expand:true,
cwd:'src/',
src:['gfy-cat/**','playpause-svg/**','!**/*.scss'],
dest:'dist/',
filter:'isFile',
options:{
process:function(content, srcpath){
return content.replace(/\.\.\/\.\.\/src\/playpause-svg\//,'');
}
}
}
},
sass: {
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 4 additions & 4 deletions dist/gfy-cat/gfy-cat.html → dist/gfy-cat.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<link rel="import" href="../../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../../../bower_components/core-ajax/core-ajax.html">
<link rel="import" href="../playpause-svg/playpause-svg.html">
<link rel="import" href="../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/core-ajax/core-ajax.html">
<link rel="import" href="playpause-svg.html">
<polymer-element name="gfy-cat" attributes="src gfyName width color fill strokeWidth ntimes loop">
<template>
<link rel="stylesheet" href="gfy-cat.css">
Expand Down Expand Up @@ -80,7 +80,7 @@
this.color="#eee";
this.visibility="hidden";
this.fill=false;
this.strokeWidth=3;
this.strokeWidth=2;
this.playMode='forward';
this.pingPongActive=false;
this.src='';
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<link rel="import" href="../../../../bower_components/polymer/polymer.html">
<link rel="import" href="../../bower_components/polymer/polymer.html">
<polymer-element name="playpause-svg" attributes="stroke strokeWidth fill">
<template>
<link rel="stylesheet" href="playpause-svg.css">
Expand Down Expand Up @@ -41,7 +41,7 @@
Polymer('playpause-svg', {
created:function(){
this.stroke="#555";
this.strokeWidth=3;
this.strokeWidth=1;
this.fill="transparent";
},
ready:function(){
Expand Down
2 changes: 1 addition & 1 deletion gfy-cat-demo.vulcanized.html

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/gfy-cat/gfy-cat.html
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
this.color="#eee";
this.visibility="hidden";
this.fill=false;
this.strokeWidth=3;
this.strokeWidth=2;
this.playMode='forward';
this.pingPongActive=false;
this.src='';
Expand Down
2 changes: 1 addition & 1 deletion src/playpause-svg/playpause-svg.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
Polymer('playpause-svg', {
created:function(){
this.stroke="#555";
this.strokeWidth=3;
this.strokeWidth=1;
this.fill="transparent";
},
ready:function(){
Expand Down

0 comments on commit 9363cc0

Please sign in to comment.