Merge pull request #29 from BassT/intro-sass

Introduce style.scss. Add npm task 'build-css'. Update README and travis config file.
HelfenKannJeder · Nov 2, 2015 · 738eedf · 738eedf
2 parents 3bed2ff + ac544f0
commit 738eedf
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@ npm-debug.log
 node_modules
 /phantomjsdriver.log
 test/.browserstackrc
-test/browserstacklocal
+test/browserstacklocal
+build
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,9 @@
+language: node_js
+node_js: stable
+
 install:
     - npm install
     - $(npm bin)/bower install
 
 script:
-    - npm run lint
-    - npm test
-    - npm run browsertest
+    - npm run postinstall-deploy
diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ LICENSE file.
 7. Run the index.html in a browser of your choice.
   Be careful about cross-site script detection, since the server is not running at the same domain as your client.
   Maybe you have to use a proxy server like nginx.
+  If `style.css` is missing, run `npm run build-css` first to transpile SASS to CSS.
 
 8. Start a python Webserver with:
   <pre>python -m SimpleHTTPServer</pre>

diff --git a/bower.json b/bower.json
@@ -2,7 +2,8 @@
 	"name": "come2help",
 	"version": "0.0.1",
 	"authors": [
-		"Valentin Zickner <[email protected]>"
+		"Valentin Zickner <[email protected]>",
+		"Sebastian Richter <[email protected]>"
 	],
 	"main": "index.html",
 	"license": "GPL",

diff --git a/css/style.css → css/style.scss b/css/style.css → css/style.scss
diff --git a/index.html b/index.html
@@ -16,7 +16,7 @@
     <script src="js/controller.js"></script>
     <script src="js/i18n.js"></script>
     <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css"/>
-    <link rel="stylesheet" href="css/style.css"/>
+    <link rel="stylesheet" href="build/css/style.css"/>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 </head>
 <body>

diff --git a/package.json b/package.json
@@ -14,6 +14,9 @@
   }, {
     "name": "Joshua Gleitze",
     "email": "[email protected]"
+  }, {
+    "name": "Sebastian Richter",
+    "email": "[email protected]"
   }],
   "license": "GPL-3.0",
   "repository": {
@@ -42,6 +45,10 @@
     "unzip": "^0.1.11"
   },
   "scripts": {
+    "postinstall-deploy": "npm run build-css && npm run lint && npm test && npm run browsertest",
+    "postinstall-dev": "npm run build-css && npm run lint && npm run watch-css",
+    "build-css": "node-sass css --output build/css",
+    "watch-css": "node-sass -w -r css --output build/css",
     "test": "mocha --slow 2000",
     "browsertest": "export BROWSER=TRUE && mocha --slow 30000",
     "lint": "eslint js/**/*.js test/**/*.js"