Merge branch 'gulp_build' into develop

.gitignore

@@ -5,7 +5,7 @@ node_modules
 *.swp
 .idea*
 config.json
-npm-debug.log
+npm-debug.log*
 lib
 website/public/bower_components
 website/public/new-stuff.html

Gruntfile.js

@@ -224,8 +224,8 @@ module.exports = function(grunt) {
 
   // Register tasks.
   grunt.registerTask('compile:sprites', ['clean:sprite', 'sprite', 'imagemin', 'cssmin']);
-  grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'browserify', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres','prepare:staticNewStuff']);
-  grunt.registerTask('build:dev', ['browserify', 'stylus', 'prepare:staticNewStuff']);
+  grunt.registerTask('build:prod', ['loadManifestFiles', 'clean:build', 'browserify', 'uglify', 'stylus', 'cssmin', 'copy:build', 'hashres']);
+  grunt.registerTask('build:dev', ['browserify', 'stylus']);
   grunt.registerTask('build:test', ['test:prepare:translations', 'build:dev']);
 
   grunt.registerTask('run:dev', [ 'build:dev', 'concurrent' ]);
@@ -239,20 +239,6 @@ module.exports = function(grunt) {
       "window.env.translations = " + JSON.stringify(i18n.translations['en']) + ';');
   });
 
-  grunt.registerTask('prepare:staticNewStuff', function() {
-    var jade  = require('jade'),
-        fs    = require('fs');
-    fs.writeFileSync(
-      './website/public/new-stuff.html',
-      jade.compileFile('./website/views/shared/new-stuff.jade')()
-    );
-  });
-
-  if(process.env.NODE_ENV == 'production')
-    grunt.registerTask('default', ['build:prod']);
-  else
-    grunt.registerTask('default', ['build:dev']);
-
   // Load tasks
   grunt.loadNpmTasks('grunt-browserify');
   grunt.loadNpmTasks('grunt-contrib-uglify');

gulpfile.js

@@ -7,5 +7,11 @@
  */
 
 require('babel/register');
-require('glob').sync('./tasks/gulp-*').forEach(require);
-require('gulp').task('default', ['test']);
+
+if (process.env.NODE_ENV === 'production') {
+  require('./tasks/gulp-newstuff');
+  require('./tasks/gulp-build');
+} else {
+  require('glob').sync('./tasks/gulp-*').forEach(require);
+  require('gulp').task('default', ['test']);
+}

package.json

@@ -33,6 +33,7 @@
     "grunt-nodemon": "~0.3.0",
     "grunt-spritesmith": "~3.5.0",
     "gulp": "^3.9.0",
+    "gulp-grunt": "^0.5.2",
     "icalendar": "lefnire/node-icalendar#e06da0e55901f0ba940dfadc42c158ed0b1fead9",
     "image-size": "~0.3.2",
     "in-app-purchase": "^0.2.0",
@@ -80,7 +81,7 @@
   "scripts": {
     "test": "./node_modules/.bin/gulp test",
     "start": "grunt run:dev",
-    "postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/grunt;",
+    "postinstall": "./node_modules/bower/bin/bower --config.interactive=false install -f; ./node_modules/.bin/gulp build;",
     "coverage": "COVERAGE=true mocha --require register-handlers.js --reporter html-cov > coverage.html; open coverage.html"
   },
   "devDependencies": {

tasks/gulp-build.js

@@ -0,0 +1,18 @@
+import gulp from 'gulp';
+require('gulp-grunt')(gulp);
+
+gulp.task('build', () => {
+  if (process.env.NODE_ENV === 'production') {
+    gulp.start('build:prod');
+  } else {
+    gulp.start('build:dev');
+  }
+});
+
+gulp.task('build:dev', ['prepare:staticNewStuff'], (done) => {
+  gulp.start('grunt-build:dev', done);
+});
+
+gulp.task('build:prod', ['prepare:staticNewStuff'], (done) => {
+  gulp.start('grunt-build:prod', done);
+});

tasks/gulp-newstuff.js

@@ -0,0 +1,10 @@
+import gulp from 'gulp';
+import jade from 'jade';
+import {writeFileSync} from 'fs';
+
+gulp.task('prepare:staticNewStuff', () => {
+  writeFileSync(
+    './website/public/new-stuff.html',
+    jade.compileFile('./website/views/shared/new-stuff.jade')()
+  );
+});

website/public/css/index.styl

@@ -110,8 +110,10 @@ html, body
 //move
 
 .new-stuff-modal // a .modal-body
-  h5
+  h2, h3
     font-weight: 700
+    font-size: 14px
+    margin-top: 10px
 
 .modal-fixed-height
   overflow-y: auto

website/public/css/static.styl

@@ -25,13 +25,26 @@ body
 
 .marketing
   text-align: center
-
+  
+.static-old-news
+  h2
+    font-weight: 700
+    font-size: 16px
+    margin-top: 30px
+    text-transform: uppercase
+  h3
+    font-weight: 700
+    font-size: 14px
+    margin-top: 20px
+  .pull-right
+    margin-left: 5px
+    
 #frontpage-play-button
   //box-shadow: 0 0 40px #494141;
-  display:inline
+  display: inline
   font-size: 20px
-  min-width:100px
-  height:50px
+  min-width: 100px
+  height: 50px
 
 #about-page
   img

website/views/static/layout.jade

@@ -23,7 +23,7 @@ html(ng-app='habitrpg')
 
     meta(charset='utf-8')
     meta(name='viewport', content='width=device-width, initial-scale=1.0')
-    
+
     //FIXME for some reason this won't load when in footerCtrl.js#deferredScripts()
     script(type="text/javascript", src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5016f6cc44ad68a4", async="async")
 

website/views/static/old-news.jade

@@ -8,5 +8,6 @@ block title
   title Old News
 
 block content
-  include ../shared/new-stuff
-  +oldNews()
+  .static-old-news
+    include ../shared/new-stuff
+    +oldNews()