Skip to content

Commit

Permalink
Merge pull request #65 from zeke/use-local-grunt
Browse files Browse the repository at this point in the history
Use local grunt
  • Loading branch information
connors committed Feb 14, 2016
2 parents 1973534 + 94963a8 commit 93a6c7e
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ before_install:
- export GEMDIR=$(rvm gemdir)

install:
- travis_retry npm install -g grunt-cli
- travis_retry npm install
- travis_retry gem install --no-document "jekyll:~>3.0.0" "rouge:~>1.10" "sass:~>3.4"

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Please file a GitHub issue to [report a bug](https://github.com/connors/photon/i
1. Install node dependencies: `npm install`.
2. Open the example app: `npm start`.

Modifying source Sass files? Open a second Terminal tab and run `grunt` to kick off a build the compiled `photon.css`.
Modifying source Sass files? Open a second Terminal tab and run `npm run build` to kick off a build of the compiled `photon.css`.

## Versioning

Expand Down
4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,15 @@
"url": "https://github.com/connors/photon/issues"
},
"scripts": {
"start": "electron dist/template-app"
"start": "electron dist/template-app",
"build": "grunt"
},
"license": "MIT",
"devDependencies": {
"electron-prebuilt": "^0.36.0",
"grunt": "~0.4.5",
"grunt-banner": "~0.5.0",
"grunt-cli": "^0.1.13",
"grunt-contrib-clean": "~0.6.0",
"grunt-contrib-compress": "~0.13.0",
"grunt-contrib-concat": "~0.5.1",
Expand Down

0 comments on commit 93a6c7e

Please sign in to comment.