Merge branch 'master' into pr-contact-form-suggestions

services/web/Gruntfile.coffee

@@ -17,7 +17,6 @@ module.exports = (grunt) ->
 	grunt.loadNpmTasks 'grunt-contrib-watch'
 	grunt.loadNpmTasks 'grunt-parallel'
 	grunt.loadNpmTasks 'grunt-exec'
-	grunt.loadNpmTasks 'grunt-contrib-cssmin'
 	# grunt.loadNpmTasks 'grunt-contrib-imagemin'
 	# grunt.loadNpmTasks 'grunt-sprity'
 
@@ -26,6 +25,8 @@ module.exports = (grunt) ->
 		exec:
 			run:
 				command:"node app.js | ./node_modules/logger-sharelatex/node_modules/bunyan/bin/bunyan --color"
+			cssmin:
+				command:"node_modules/clean-css/bin/cleancss --s0 -o public/stylesheets/style.css public/stylesheets/style.css"
 
 
 		watch:
@@ -134,10 +135,8 @@ module.exports = (grunt) ->
 				files:
 					"public/stylesheets/style.css": "public/stylesheets/style.less"
 
-		cssmin:
-			target:
-				files:
-					"public/stylesheets/style.css": "public/stylesheets/style.css"
+
+
 
 		env:
 			run:
@@ -364,7 +363,7 @@ module.exports = (grunt) ->
 	grunt.registerTask 'compile:server', 'Compile the server side coffee script', ['clean:app', 'coffee:app', 'coffee:app_dir', 'compile:modules:server']
 	grunt.registerTask 'compile:client', 'Compile the client side coffee script', ['coffee:client', 'coffee:sharejs', 'wrap_sharejs', "compile:modules:client", 'compile:modules:inject_clientside_includes']
 	grunt.registerTask 'compile:css', 'Compile the less files to css', ['less']
-	grunt.registerTask 'compile:minify', 'Concat and minify the client side js', ['requirejs', "file_append", "cssmin"]
+	grunt.registerTask 'compile:minify', 'Concat and minify the client side js', ['requirejs', "file_append", "exec:cssmin",]
 	grunt.registerTask 'compile:unit_tests', 'Compile the unit tests', ['clean:unit_tests', 'coffee:unit_tests']
 	grunt.registerTask 'compile:acceptance_tests', 'Compile the acceptance tests', ['clean:acceptance_tests', 'coffee:acceptance_tests']
 	grunt.registerTask 'compile:smoke_tests', 'Compile the smoke tests', ['coffee:smoke_tests']

services/web/app/views/layout.jade

@@ -19,7 +19,6 @@ html(itemscope, itemtype='http://schema.org/Product')
 
 		link(rel="icon", href="/favicon.ico")
 		link(rel='stylesheet', href='/stylesheets/style.css?fingerprint='+fingerprint('/stylesheets/style.css'))
-		link(href="//netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css",rel="stylesheet")
 
 		if settings.i18n.subdomainLang
 			each subdomainDetails in settings.i18n.subdomainLang
@@ -54,7 +53,7 @@ html(itemscope, itemtype='http://schema.org/Product')
 				var Countly = Countly || {};
 				Countly.q = Countly.q || [];
 				Countly.app_key = '#{settings.analytics.countly.token}';
-				Countly.url = 'https://try.count.ly'; 
+				Countly.url = '#{settings.analytics.countly.server}';
 
 				Countly.q.push(['track_sessions']);
 				Countly.q.push(['track_pageview']);

services/web/package.json

@@ -69,11 +69,11 @@
     "grunt-bunyan": "0.5.0",
     "grunt-contrib-clean": "0.5.0",
     "grunt-contrib-coffee": "0.10.0",
-    "grunt-contrib-cssmin": "^1.0.1",
     "grunt-contrib-less": "0.9.0",
     "grunt-contrib-requirejs": "0.4.1",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-env": "0.4.4",
+    "clean-css": "^3.4.18",
     "grunt-exec": "^0.4.7",
     "grunt-execute": "^0.2.2",
     "grunt-file-append": "0.0.6",

services/web/public/stylesheets/core/variables.less

@@ -49,8 +49,8 @@
 //
 //## Font, line-height, and color for body text, headings, and more.
 
-@import url(//fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);
-@import url(//fonts.googleapis.com/css?family=PT+Serif:400,600,700);
+@import url(https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700);
+@import url(https://fonts.googleapis.com/css?family=PT+Serif:400,600,700);
 
 @font-family-sans-serif:  "Open Sans", sans-serif;
 @font-family-serif:       "PT Serif", serif;

services/web/public/stylesheets/style.less

@@ -1,5 +1,7 @@
 // Core variables and mixins
 @import "core/variables.less";
+@import url(https://netdna.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css);
+
 @import "core/mixins.less";
 
 // Reset