Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	package.js
  • Loading branch information
Dominic committed Sep 3, 2015
2 parents c7e3c6f + 7e5147c commit 96fd423
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions package.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
var Version = "v2.3";

Package.describe({
summary: "Icons for Percolate, version" + Version
summary: 'Icons for Percolate, version' + Version
});

Package.on_use(function(api) {
var path = Npm.require("path");
Package.onUse(function(api) {
var path = Npm.require('path');
var assetPath = path.join(Version);

api.add_files(path.join(assetPath, "fonts", "percolate.eot"), "client");
api.add_files(path.join(assetPath, "fonts", "percolate.svg"), "client");
api.add_files(path.join(assetPath, "fonts", "percolate.ttf"), "client");
api.add_files(path.join(assetPath, "fonts", "percolate.woff"), "client");
api.addFiles(path.join(assetPath, 'fonts', 'percolate.eot'), 'client', {isAsset: true});
api.addFiles(path.join(assetPath, 'fonts', 'percolate.svg'), 'client', {isAsset: true});
api.addFiles(path.join(assetPath, 'fonts', 'percolate.ttf'), 'client', {isAsset: true});
api.addFiles(path.join(assetPath, 'fonts', 'percolate.woff'), 'client', {isAsset: true});

api.add_files(path.join("edited-style.css"), "client");
api.addFiles(path.join('edited-style.css'), 'client');
});

0 comments on commit 96fd423

Please sign in to comment.