Move src assets files out of dist folder, clean up grunt and related files, separate functions and mixins scss...

Gruntfile.js

@@ -1,6 +1,5 @@
 module.exports = function(grunt) {
 
-
 	function loadConfig(path) {
 		var glob = require('glob');
 		var object = {};
@@ -18,15 +17,15 @@ module.exports = function(grunt) {
 		pkg: grunt.file.readJSON('package.json')
 	}
 
-	grunt.loadTasks('grunt_tasks');
-	grunt.util._.extend(config, loadConfig('./grunt_tasks/'));
+	grunt.loadTasks('build/grunt');
+	grunt.util._.extend(config, loadConfig('./build/grunt/'));
 	grunt.initConfig(config);
 
 	// Load tasks
 	require('load-grunt-tasks')(grunt);
 
 	// Register tasks
-	grunt.registerTask('default', ['watch', 'notify:watch']);
+	grunt.registerTask('default', ['build']);
 	grunt.registerTask('sync', ['browserSync', 'watch', 'notify:watch']);
 	grunt.registerTask('build', [
 		// CSS
@@ -35,24 +34,22 @@ module.exports = function(grunt) {
 		'cssmin',
 		// JS
 		'browserify:prod',
-		'eslint',
 		'uglify',
 		// SVG
 		'svgstore',
-		'svgmin'
+		'svgmin',
+		// Notify
+		'notify:build'
 	]);
+	grunt.registerTask('w', ['watch', 'notify:watch']);
 	grunt.registerTask('c', [
 		'csscomb'
 	]);
 	grunt.registerTask('j', [
-		'jshint'
+		'eslint'
 	]);
-	grunt.registerTask('wlint', [
-		// PHP
-		'phplint',
-		'jsonlint',
-		// Utilities
-		'watch'
+	grunt.registerTask('p', [
+		'phplint'
 	]);
 
 };

assets/scripts/App.js

@@ -17,7 +17,6 @@ class App {
 
 	// Init modules
 	// ==========================================================================
-
 	/**
 	 * Module init
 	 *

assets/styles/_imports.scss

@@ -8,7 +8,8 @@
 
 // Tools
 // ==========================================================================
-@import "tools/tools";
+@import "tools/functions";
+@import "tools/mixins";
 
 // Generic
 // ==========================================================================

assets/styles/base/_base.scss

@@ -34,5 +34,3 @@ a {
 		color: $link-hover;
 	}
 }
-
-

assets/styles/tools/_functions.scss

@@ -0,0 +1,14 @@
+// ==========================================================================
+// Functions
+// ==========================================================================
+@function em($px, $base: $font-size) {
+	@return ($px / $base) * 1em;
+}
+
+@function rem($px, $base: $font-size) {
+	@return ($px / $base) * 1rem;
+}
+
+@function span($fraction) {
+	@return $fraction * 100%;
+}

assets/styles/tools/_mixins.scss

@@ -1,21 +1,4 @@
 // ==========================================================================
-// Tools
-// ==========================================================================
-
-// Functions
-// ==========================================================================
-@function em($px, $base: $font-size) {
-	@return ($px / $base) * 1em;
-}
-
-@function rem($px, $base: $font-size) {
-	@return ($px / $base) * 1rem;
-}
-
-@function span($fraction) {
-	@return $fraction * 100%;
-}
-
 // Mixins
 // ==========================================================================
 @mixin vertical-center {
@@ -59,4 +42,3 @@
 @mixin overflow-scrolling {
 	-webkit-overflow-scrolling: touch;
 }
-

build/grunt/browserSync.js

@@ -2,9 +2,9 @@ module.exports = {
 	dev: {
 		bsFiles: {
 			src : [
-				 'www/assets/styles/dist/*.css'
-				,'www/assets/scripts/dist/*.js'
-				,'www/assets/images/dist/*.svg'
+				 'www/assets/styles/**/*.css'
+				,'www/assets/scripts/**/*.js'
+				,'www/assets/images/**/*.svg'
 				,'www/**/*.php'
 			]
 		},
@@ -15,4 +15,4 @@ module.exports = {
 			notify: false
 		}
 	}
-}
+};

build/grunt/browserify.js

@@ -6,9 +6,9 @@ module.exports = {
 			exclude: ''
 		},
 		files: {
-			'www/assets/scripts/dist/app.js': [
-                'www/assets/scripts/src/**/*.js',
-                '!www/assets/scripts/src/vendors/*.js'
+			'www/assets/scripts/app.js': [
+                'assets/scripts/**/*.js',
+                '!assets/scripts/vendors/*.js'
             ]
 		}
 	},
@@ -19,9 +19,9 @@ module.exports = {
 			exclude: ''
 		},
 		files: {
-            'www/assets/scripts/dist/app.js': [
-                'www/assets/scripts/src/**/*.js',
-                '!www/assets/scripts/src/vendors/*.js'
+            'www/assets/scripts/app.js': [
+                'assets/scripts/**/*.js',
+                '!assets/scripts/vendors/*.js'
             ]
 		}
 	}

build/grunt/concat.js

@@ -0,0 +1,8 @@
+module.exports = {
+	vendors: {
+		src: [
+			'assets/scripts/vendors/*.js'
+		],
+		dest: 'www/assets/scripts/vendors.js'
+	}
+};

build/grunt/csscomb.js

@@ -4,8 +4,8 @@ module.exports = {
 	},
 	build: {
 		expand: true,
-		cwd: 'www/assets/styles/src/',
+		cwd: 'assets/styles/',
 		src: ['**/*.scss', '!base/_fonts.scss'],
-		dest: 'www/assets/styles/src/'
+		dest: 'assets/styles/'
 	}
 };

build/grunt/cssmin.js

@@ -2,9 +2,9 @@ module.exports = {
 	combine: {
 		files: [{
 			expand: true,
-			cwd: 'www/assets/styles/dist/',
+			cwd: 'www/assets/styles/',
 			src: '*.css',
-			dest: 'www/assets/styles/dist/'
+			dest: 'www/assets/styles/'
 		}]
 	}
-}
+};

build/grunt/eslint.js

@@ -4,7 +4,7 @@ module.exports = {
 		configFile: '.eslintrc'
 	},
 	target: [
-        'www/assets/scripts/src/**/*.js',
-        '!www/assets/scripts/src/vendors/*.js'
+        'assets/scripts/**/*.js',
+        '!assets/scripts/vendors/*.js'
     ],
 };

build/grunt/notify.js

@@ -5,28 +5,28 @@ module.exports = {
 			message: 'Keeping an eye out, Chief!'
 		}
 	},
+	build: {
+		options: {
+			// title: '<%= pkg.title %>',
+			message: 'Everything is ready to go!'
+		}
+	},
 	sass: {
 		options: {
 			// title: '<%= pkg.title %>',
-			message: 'Sass compiled to CSS.'
-		}
-	},
-	jshint: {
-		options: {
-			// title: '<%= pkg.title %>',
-			message: 'Sass compiled to CSS.'
+			message: 'CSS is compiled'
 		}
 	},
 	javascript: {
 		options: {
 			// title: '<%= pkg.title %>',
-			message: 'JavaScript is ready.'
+			message: 'JavaScript is compiled'
 		}
 	},
 	svg: {
 		options: {
 			// title: '<%= pkg.title %>',
-			message: 'SVG is now concatenated'
+			message: 'SVG is concatenated'
 		}
 	}
-}
+};

build/grunt/phplint.js

@@ -0,0 +1,14 @@
+module.exports = {
+	options: {
+		swapPath: '/tmp',
+		phpArgs : {
+			// add -f for fatal errors
+			'-lf': null
+		}
+	},
+
+	project: [
+		'**/*.php'
+	]
+}
+;

build/grunt/postcss.js

@@ -9,11 +9,11 @@ module.exports = {
 		},
 		files: [
 			{
-				src : ['www/assets/styles/dist/*.css'],
-				dest : 'www/assets/styles/dist/',
+				src : ['www/assets/styles/*.css'],
+				dest : 'www/assets/styles/',
 				expand : true,
 				flatten : true
 			}
 		]
 	}
-}
+};

build/grunt/sass.js

@@ -4,7 +4,7 @@ module.exports = {
 	},
 	dist: {
 		files: {
-			'www/assets/styles/dist/main.css': 'www/assets/styles/src/main.scss'
+			'www/assets/styles/main.css': 'assets/styles/main.scss'
 		}
 	}
-}
+};

build/grunt/svgmin.js

@@ -15,10 +15,10 @@ module.exports = {
 	},
 	dist: {
 		expand: true,
-		cwd: 'www/assets/images/dist/',
+		cwd: 'www/assets/images/',
 		src: '*.svg',
-		dest: 'www/assets/images/dist/',
+		dest: 'www/assets/images/',
 		ext: '.svg',
 		extDot: 'first'
 	}
-}
+};

build/grunt/svgstore.js

@@ -0,0 +1,10 @@
+module.exports = {
+	options: {
+
+	},
+	default : {
+		files: {
+			'www/assets/images/sprite.svg': ['assets/images/sprite/*.svg'],
+		}
+	}
+};

build/grunt/uglify.js

@@ -2,9 +2,9 @@ module.exports = {
 	target: {
 		files: [{
 			expand: true,
-			cwd: 'www/assets/scripts/dist/',
+			cwd: 'www/assets/scripts/',
 			src: '**/*.js',
-			dest: 'www/assets/scripts/dist/'
+			dest: 'www/assets/scripts/'
 		}]
 	}
-}
+};

build/grunt/watch.js

@@ -1,19 +1,19 @@
 module.exports = {
 	javascript_app: {
 		files: [
-			'www/assets/scripts/src/**/*.js',
-			'!www/assets/scripts/src/vendors/*.js'
+			'assets/scripts/**/*.js',
+			'!assets/scripts/vendors/*.js'
 		],
 		tasks: ['browserify:dev', 'notify:javascript']
 	},
 	javascript_vendors: {
 		files: [
-			'www/assets/scripts/src/vendors/*.js'
+			'assets/scripts/vendors/*.js'
 		],
 		tasks: ['concat:vendors', 'notify:javascript']
 	},
 	sass: {
-		files: ['www/assets/styles/src/**/*.scss'],
+		files: ['assets/styles/**/*.scss'],
 		tasks: ['sass', 'postcss', 'notify:sass'],
 		options: {
 			spawn: false,
@@ -21,13 +21,13 @@ module.exports = {
 		}
 	},
 	svg: {
-		files: ['www/assets/images/**/*.svg'],
+		files: ['assets/images/**/*.svg'],
 		tasks: ['svgstore', 'notify:svg']
 	},
 	tasks: {
-		files: ['grunt_tasks/*.js'],
+		files: ['build/grunt/*.js'],
 		options: {
 			reload: true
 		}
 	}
-}
+};

grunt_tasks/concat.js

@@ -1,17 +0,0 @@
-module.exports = {
-	app: {
-		src: [
-			'www/assets/scripts/src/app/*.js',
-			'www/assets/scripts/src/templates/*.js',
-			'www/assets/scripts/src/widgets/*.js',
-			'www/assets/scripts/src/App.js'
-		],
-		dest: 'www/assets/scripts/dist/app.js'
-	},
-	vendors: {
-		src: [
-			'www/assets/scripts/src/vendors/*.js'
-		],
-		dest: 'www/assets/scripts/dist/vendors.js'
-	}
-};

grunt_tasks/jshint.js

@@ -1,19 +0,0 @@
-module.exports = {
-	options: {
-		"curly":true,
-		"eqeqeq": true,
-		"eqnull": true,
-		"undef":true,
-		"unused": true,
-		browser:true,
-		"globals":{
-			"window":true,
-			"$":true,
-			"jQuery":true
-		}
-	},
-	src: [
-		'www/assets/scripts/src/**/*.js',
-		'!www/assets/scripts/src/vendors/**/*.js'
-	],
-}

grunt_tasks/phplint.js

@@ -1,22 +0,0 @@
-module.exports = {
-	options: {
-		swapPath: '/tmp',
-		phpArgs : {
-			// add -f for fatal errors
-			'-lf': null
-		}
-	},
-
-	project: [
-		'code/*.php',
-		'code/**/*.php',
-		'www/assets/templates/*.php',
-		'www/assets/templates/**/*.php'
-	],
-	charcoal: [
-		'../charcoal/core/code/*.php',
-		'../charcoal/core/code/**/*.php',
-		'../charcoal/modules/**/code/*.php',
-		'../charcoal/modules/**/code/**/*.php'
-	]
-}

grunt_tasks/svgstore.js

@@ -1,10 +0,0 @@
-module.exports = {
-	options: {
-
-	},
-	default : {
-		files: {
-			'www/assets/images/dist/sprite.svg': ['www/assets/images/svgs/*.svg'],
-		}
-	}
-}

package.json

@@ -4,27 +4,25 @@
   "author": "Locomotive <info@locomotive.ca>",
   "devDependencies": {
     "autoprefixer": "6.3.3",
-    "babel-preset-es2015": "6.5.0",
+    "babel-preset-es2015": "6.6.0",
     "babelify": "7.2.0",
     "eslint-tap": "1.1.0",
-    "glob": "7.0.0",
+    "glob": "7.0.3",
     "grunt": "0.4.5",
     "grunt-browser-sync": "2.2.0",
     "grunt-browserify": "4.0.1",
     "grunt-contrib-concat": "1.0.0",
-    "grunt-contrib-cssmin": "0.14.0",
-    "grunt-contrib-jshint": "1.0.0",
-    "grunt-contrib-uglify": "0.11.1",
+    "grunt-contrib-cssmin": "1.0.0",
+    "grunt-contrib-uglify": "1.0.0",
     "grunt-contrib-watch": "0.6.1",
     "grunt-csscomb": "3.1.0",
     "grunt-eslint": "18.0.0",
-    "grunt-jsonlint": "1.0.7",
-    "grunt-notify": "0.4.3",
+    "grunt-notify": "0.4.5",
     "grunt-phplint": "0.0.8",
-    "grunt-postcss": "0.7.2",
+    "grunt-postcss": "0.8.0",
     "grunt-sass": "1.1.0",
     "grunt-svgmin": "3.1.2",
     "grunt-svgstore": "1.0.0",
-    "load-grunt-tasks": "3.4.0"
+    "load-grunt-tasks": "3.4.1"
   }
 }

www/assets/emails/index.html

@@ -9,9 +9,9 @@
 			<table border="0" cellpadding="0" cellspacing="0" width="100%">
 				<tr>
 					<td align="center" valign="top">
-						<table border="0" cellpadding="0" cellspacing="0" width="600" id="templateBody">
+						<table border="0" cellpadding="0" cellspacing="0" width="600">
 							<tr>
-								<td valign="top" class="bodyContent">
+								<td valign="top">
 									<table border="0" cellpadding="20" cellspacing="0" width="100%">
 										<tr>
 											<td valign="top">

www/assets/images/sprite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg"/>

www/assets/scripts/dist/vendors.js

@@ -1 +0,0 @@
-!function(e,t){"function"==typeof define&&define.amd?define([],function(){return e.svg4everybody=t()}):"object"==typeof exports?module.exports=t():e.svg4everybody=t()}(this,function(){function e(e,t){if(t){var n=document.createDocumentFragment(),i=!e.getAttribute("viewBox")&&t.getAttribute("viewBox");i&&e.setAttribute("viewBox",i);for(var a=t.cloneNode(!0);a.childNodes.length;)n.appendChild(a.firstChild);e.appendChild(n)}}function t(t){t.onreadystatechange=function(){if(4===t.readyState){var n=t._cachedDocument;n||(n=t._cachedDocument=document.implementation.createHTMLDocument(""),n.body.innerHTML=t.responseText,t._cachedTarget={}),t._embeds.splice(0).map(function(i){var a=t._cachedTarget[i.id];a||(a=t._cachedTarget[i.id]=n.getElementById(i.id)),e(i.svg,a)})}},t.onreadystatechange()}function n(n){function i(){for(var n=0;n<g.length;){var r=g[n],d=r.parentNode;if(d&&/svg/i.test(d.nodeName)){var c=r.getAttribute("xlink:href");if(a&&(!o.validate||o.validate(c,d,r))){d.removeChild(r);var l=c.split("#"),m=l.shift(),f=l.join("#");if(m.length){var v=s[m];v||(v=s[m]=new XMLHttpRequest,v.open("GET",m),v.send(),v._embeds=[]),v._embeds.push({svg:d,id:f}),t(v)}else e(d,document.getElementById(f))}}else++n}u(i,67)}var a,o=Object(n),r=/\bTrident\/[567]\b|\bMSIE (?:9|10)\.0\b/,d=/\bAppleWebKit\/(\d+)\b/,c=/\bEdge\/12\.(\d+)\b/;a="polyfill"in o?o.polyfill:r.test(navigator.userAgent)||(navigator.userAgent.match(c)||[])[1]<10547||(navigator.userAgent.match(d)||[])[1]<537;var s={},u=window.requestAnimationFrame||setTimeout,g=document.getElementsByTagName("use");a&&i()}return n});

www/assets/scripts/vendors.js

@@ -0,0 +1 @@
+!function(a,b){"function"==typeof define&&define.amd?define([],function(){return a.svg4everybody=b()}):"object"==typeof exports?module.exports=b():a.svg4everybody=b()}(this,function(){function a(a,b){if(b){var c=document.createDocumentFragment(),d=!a.getAttribute("viewBox")&&b.getAttribute("viewBox");d&&a.setAttribute("viewBox",d);for(var e=b.cloneNode(!0);e.childNodes.length;)c.appendChild(e.firstChild);a.appendChild(c)}}function b(b){b.onreadystatechange=function(){if(4===b.readyState){var c=b._cachedDocument;c||(c=b._cachedDocument=document.implementation.createHTMLDocument(""),c.body.innerHTML=b.responseText,b._cachedTarget={}),b._embeds.splice(0).map(function(d){var e=b._cachedTarget[d.id];e||(e=b._cachedTarget[d.id]=c.getElementById(d.id)),a(d.svg,e)})}},b.onreadystatechange()}function c(c){function d(){for(var c=0;c<l.length;){var g=l[c],h=g.parentNode;if(h&&/svg/i.test(h.nodeName)){var i=g.getAttribute("xlink:href");if(e&&(!f.validate||f.validate(i,h,g))){h.removeChild(g);var m=i.split("#"),n=m.shift(),o=m.join("#");if(n.length){var p=j[n];p||(p=j[n]=new XMLHttpRequest,p.open("GET",n),p.send(),p._embeds=[]),p._embeds.push({svg:h,id:o}),b(p)}else a(h,document.getElementById(o))}}else++c}k(d,67)}var e,f=Object(c),g=/\bTrident\/[567]\b|\bMSIE (?:9|10)\.0\b/,h=/\bAppleWebKit\/(\d+)\b/,i=/\bEdge\/12\.(\d+)\b/;e="polyfill"in f?f.polyfill:g.test(navigator.userAgent)||(navigator.userAgent.match(i)||[])[1]<10547||(navigator.userAgent.match(h)||[])[1]<537;var j={},k=window.requestAnimationFrame||setTimeout,l=document.getElementsByTagName("use");e&&d()}return c});

www/assets/styles/dist/main.css

@@ -1,676 +0,0 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */
-/**
- * 1. Set default font family to sans-serif.
- * 2. Prevent iOS text size adjust after orientation change, without disabling
- *    user zoom.
- */
-html {
-  font-family: sans-serif;
-  /* 1 */
-  -ms-text-size-adjust: 100%;
-  /* 2 */
-  -webkit-text-size-adjust: 100%;
-  /* 2 */ }
-
-/**
- * Remove default margin.
- */
-body {
-  margin: 0; }
-
-/* HTML5 display definitions
-   ========================================================================== */
-/**
- * Correct `block` display not defined for any HTML5 element in IE 8/9.
- * Correct `block` display not defined for `details` or `summary` in IE 10/11
- * and Firefox.
- * Correct `block` display not defined for `main` in IE 11.
- */
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-hgroup,
-main,
-menu,
-nav,
-section,
-summary {
-  display: block; }
-
-/**
- * 1. Correct `inline-block` display not defined in IE 8/9.
- * 2. Normalize vertical alignment of `progress` in Chrome, Firefox, and Opera.
- */
-audio,
-canvas,
-progress,
-video {
-  display: inline-block;
-  /* 1 */
-  vertical-align: baseline;
-  /* 2 */ }
-
-/**
- * Prevent modern browsers from displaying `audio` without controls.
- * Remove excess height in iOS 5 devices.
- */
-audio:not([controls]) {
-  display: none;
-  height: 0; }
-
-/**
- * Address `[hidden]` styling not present in IE 8/9/10.
- * Hide the `template` element in IE 8/9/11, Safari, and Firefox < 22.
- */
-[hidden],
-template {
-  display: none; }
-
-/* Links
-   ========================================================================== */
-/**
- * Remove the gray background color from active links in IE 10.
- */
-a {
-  background-color: transparent; }
-
-/**
- * Improve readability when focused and also mouse hovered in all browsers.
- */
-a:active,
-a:hover {
-  outline: 0; }
-
-/* Text-level semantics
-   ========================================================================== */
-/**
- * Address styling not present in IE 8/9/10/11, Safari, and Chrome.
- */
-abbr[title] {
-  border-bottom: 1px dotted; }
-
-/**
- * Address style set to `bolder` in Firefox 4+, Safari, and Chrome.
- */
-b,
-strong {
-  font-weight: bold; }
-
-/**
- * Address styling not present in Safari and Chrome.
- */
-dfn {
-  font-style: italic; }
-
-/**
- * Address variable `h1` font-size and margin within `section` and `article`
- * contexts in Firefox 4+, Safari, and Chrome.
- */
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0; }
-
-/**
- * Address styling not present in IE 8/9.
- */
-mark {
-  color: #000000;
-  background: #ffff00; }
-
-/**
- * Address inconsistent and variable font size in all browsers.
- */
-small {
-  font-size: 80%; }
-
-/**
- * Prevent `sub` and `sup` affecting `line-height` in all browsers.
- */
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline; }
-
-sup {
-  top: -0.5em; }
-
-sub {
-  bottom: -0.25em; }
-
-/* Embedded content
-   ========================================================================== */
-/**
- * Remove border when inside `a` element in IE 8/9/10.
- */
-img {
-  border: 0; }
-
-/**
- * Correct overflow not hidden in IE 9/10/11.
- */
-svg:not(:root) {
-  overflow: hidden; }
-
-/* Grouping content
-   ========================================================================== */
-/**
- * Address margin not present in IE 8/9 and Safari.
- */
-figure {
-  margin: 1em 40px; }
-
-/**
- * Address differences between Firefox and other browsers.
- */
-hr {
-  box-sizing: content-box;
-  height: 0; }
-
-/**
- * Contain overflow in all browsers.
- */
-pre {
-  overflow: auto; }
-
-/**
- * Address odd `em`-unit font size rendering in all browsers.
- */
-code,
-kbd,
-pre,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em; }
-
-/* Forms
-   ========================================================================== */
-/**
- * Known limitation: by default, Chrome and Safari on OS X allow very limited
- * styling of `select`, unless a `border` property is set.
- */
-/**
- * 1. Correct color not being inherited.
- *    Known issue: affects color of disabled elements.
- * 2. Correct font properties not being inherited.
- * 3. Address margins set differently in Firefox 4+, Safari, and Chrome.
- */
-button,
-input,
-optgroup,
-select,
-textarea {
-  font: inherit;
-  /* 2 */
-  margin: 0;
-  /* 3 */
-  color: inherit;
-  /* 1 */ }
-
-/**
- * Address `overflow` set to `hidden` in IE 8/9/10/11.
- */
-button {
-  overflow: visible; }
-
-/**
- * Address inconsistent `text-transform` inheritance for `button` and `select`.
- * All other form control elements do not inherit `text-transform` values.
- * Correct `button` style inheritance in Firefox, IE 8/9/10/11, and Opera.
- * Correct `select` style inheritance in Firefox.
- */
-button,
-select {
-  text-transform: none; }
-
-/**
- * 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio`
- *    and `video` controls.
- * 2. Correct inability to style clickable `input` types in iOS.
- * 3. Improve usability and consistency of cursor style between image-type
- *    `input` and others.
- */
-button,
-html input[type="button"],
-input[type="reset"],
-input[type="submit"] {
-  cursor: pointer;
-  /* 3 */
-  -webkit-appearance: button;
-  /* 2 */ }
-
-/**
- * Re-set default cursor for disabled elements.
- */
-button[disabled],
-html input[disabled] {
-  cursor: default; }
-
-/**
- * Remove inner padding and border in Firefox 4+.
- */
-button::-moz-focus-inner,
-input::-moz-focus-inner {
-  padding: 0;
-  border: 0; }
-
-/**
- * Address Firefox 4+ setting `line-height` on `input` using `!important` in
- * the UA stylesheet.
- */
-input {
-  line-height: normal; }
-
-/**
- * It's recommended that you don't attempt to style these elements.
- * Firefox's implementation doesn't respect box-sizing, padding, or width.
- *
- * 1. Address box sizing set to `content-box` in IE 8/9/10.
- * 2. Remove excess padding in IE 8/9/10.
- */
-input[type="checkbox"],
-input[type="radio"] {
-  box-sizing: border-box;
-  /* 1 */
-  padding: 0;
-  /* 2 */ }
-
-/**
- * Fix the cursor style for Chrome's increment/decrement buttons. For certain
- * `font-size` values of the `input`, it causes the cursor style of the
- * decrement button to change from `default` to `text`.
- */
-input[type="number"]::-webkit-inner-spin-button,
-input[type="number"]::-webkit-outer-spin-button {
-  height: auto; }
-
-/**
- * 1. Address `appearance` set to `searchfield` in Safari and Chrome.
- * 2. Address `box-sizing` set to `border-box` in Safari and Chrome
- *    (include `-moz` to future-proof).
- */
-input[type="search"] {
-  /* 2 */
-  box-sizing: content-box;
-  -webkit-appearance: textfield;
-  /* 1 */ }
-
-/**
- * Remove inner padding and search cancel button in Safari and Chrome on OS X.
- * Safari (but not Chrome) clips the cancel button when the search input has
- * padding (and `textfield` appearance).
- */
-input[type="search"]::-webkit-search-cancel-button,
-input[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none; }
-
-/**
- * Define consistent border, margin, and padding.
- */
-fieldset {
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
-  border: 1px solid #c0c0c0; }
-
-/**
- * 1. Correct `color` not being inherited in IE 8/9/10/11.
- * 2. Remove padding so people aren't caught out if they zero out fieldsets.
- */
-legend {
-  padding: 0;
-  /* 2 */
-  border: 0;
-  /* 1 */ }
-
-/**
- * Remove default vertical scrollbar in IE 8/9/10/11.
- */
-textarea {
-  overflow: auto; }
-
-/**
- * Don't inherit the `font-weight` (applied by a rule above).
- * NOTE: the default cannot safely be changed in Chrome and Safari on OS X.
- */
-optgroup {
-  font-weight: bold; }
-
-/* Tables
-   ========================================================================== */
-/**
- * Remove most spacing between table cells.
- */
-table {
-  border-spacing: 0;
-  border-collapse: collapse; }
-
-td,
-th {
-  padding: 0; }
-
-html {
-  box-sizing: border-box; }
-
-*, *:before, *:after {
-  box-sizing: inherit; }
-
-audio,
-canvas,
-iframe,
-img,
-svg,
-video {
-  vertical-align: middle; }
-
-input,
-select,
-textarea {
-  display: block;
-  margin: 0;
-  padding: 0;
-  width: 100%;
-  outline: 0;
-  border: 0;
-  border-radius: 0;
-  color: inherit;
-  font: inherit;
-  line-height: normal;
-  -webkit-appearance: none;
-     -moz-appearance: none;
-          appearance: none; }
-
-select {
-  text-transform: none;
-  /*&:-moz-focusring {
-        color: transparent;
-        text-shadow: 0 0 0 #000000; // Text :focus color
-    }*/ }
-  select::-ms-expand {
-    display: none; }
-  select::-ms-value {
-    background: none;
-    color: inherit; }
-
-textarea {
-  overflow: auto;
-  resize: vertical; }
-
-button,
-.button {
-  display: inline-block;
-  overflow: visible;
-  margin: 0;
-  padding: 0;
-  outline: 0;
-  border: 0;
-  background: none;
-  color: inherit;
-  vertical-align: middle;
-  text-align: center;
-  text-decoration: none;
-  text-transform: none;
-  font: inherit;
-  line-height: normal;
-  cursor: pointer;
-  -webkit-user-select: none;
-     -moz-user-select: none;
-      -ms-user-select: none;
-          user-select: none; }
-  button:hover,
-  .button:hover {
-    text-decoration: none; }
-
-html {
-  font-family: sans-serif;
-  font-size: 16px;
-  line-height: 1.4;
-  color: #222222; }
-
-::-moz-selection {
-  background: #3297fd;
-  color: #ffffff;
-  text-shadow: none; }
-
-::selection {
-  background: #3297fd;
-  color: #ffffff;
-  text-shadow: none; }
-
-hr {
-  display: block;
-  height: 1px;
-  margin: 1em 0;
-  padding: 0;
-  border: 0;
-  border-top: 1px solid #cccccc; }
-
-img, svg {
-  max-width: 100%; }
-
-a {
-  color: #1a0dab; }
-  a:hover {
-    color: #13097c; }
-
-.h, h1, .h1, h2, .h2, h3, .h3, h4, .h4, h5, .h5, h6, .h6 {
-  line-height: 1.2;
-  margin-top: 0; }
-
-h1, .h1 {
-  font-size: 32px; }
-
-h2, .h2 {
-  font-size: 24px; }
-
-h3, .h3 {
-  font-size: 19px; }
-
-h4, .h4 {
-  font-size: 16px; }
-
-h5, .h5 {
-  font-size: 13px; }
-
-h6, .h6 {
-  font-size: 11px; }
-
-.container {
-  position: relative;
-  max-width: none0;
-  margin: 0 auto;
-  padding-right: 0;
-  padding-left: 0; }
-
-.grid {
-  margin-left: 0;
-  letter-spacing: normal;
-  font-size: 0; }
-
-.grid_item {
-  display: inline-block;
-  padding-left: 0;
-  width: 100%;
-  vertical-align: top;
-  font-size: 1rem; }
-
-.label, .checkbox-label, .radio-label {
-  display: block;
-  margin-bottom: 0.25em; }
-
-.input, .checkbox-label::before, .radio-label::before, .checkbox-label::after, .radio-label::after, .select, .textarea {
-  padding: 10px;
-  border-width: 1px;
-  border-style: solid;
-  border-color: lightgray;
-  background-color: white; }
-  .input:focus, .checkbox-label:focus::before, .radio-label:focus::before, .checkbox-label:focus::after, .radio-label:focus::after, .select:focus, .textarea:focus {
-    border-color: gray; }
-  .input::-webkit-input-placeholder, .select::-webkit-input-placeholder, .textarea::-webkit-input-placeholder {
-    color: gray; }
-  .input::-moz-placeholder, .select::-moz-placeholder, .textarea::-moz-placeholder {
-    color: gray; }
-  .input:-ms-input-placeholder, .select:-ms-input-placeholder, .textarea:-ms-input-placeholder {
-    color: gray; }
-  .input::placeholder, .select::placeholder, .textarea::placeholder {
-    color: gray; }
-
-.checkbox, .radio {
-  position: absolute;
-  width: 0;
-  opacity: 0; }
-  .checkbox:focus + .checkbox-label::before, .radio:focus + .checkbox-label::before, .checkbox:focus + .radio-label::before, .radio:focus + .radio-label::before {
-    border-color: gray; }
-  .checkbox:checked + .checkbox-label::after, .radio:checked + .checkbox-label::after, .checkbox:checked + .radio-label::after, .radio:checked + .radio-label::after {
-    opacity: 1; }
-
-.checkbox-label, .radio-label {
-  position: relative;
-  display: inline-block;
-  margin-right: 0.5em;
-  padding-left: 28px; }
-  .checkbox-label::before, .radio-label::before, .checkbox-label::after, .radio-label::after {
-    position: absolute;
-    top: 50%;
-    left: 0;
-    display: inline-block;
-    margin-top: -9px;
-    padding: 0;
-    width: 18px;
-    height: 18px;
-    content: ""; }
-  .checkbox-label::after, .radio-label::after {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2213%22%20height%3D%2210.5%22%20viewBox%3D%220%200%2013%2010.5%22%20enable-background%3D%22new%200%200%2013%2010.5%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpath%20fill%3D%22%23424242%22%20d%3D%22M4.8%205.8L2.4%203.3%200%205.7l4.8%204.8L13%202.4c0%200-2.4-2.4-2.4-2.4L4.8%205.8z%22%2F%3E%3C%2Fsvg%3E");
-    background-position: center;
-    background-size: 13px;
-    background-repeat: no-repeat;
-    opacity: 0; }
-
-.radio-label::before, .radio-label::after {
-  border-radius: 50%; }
-
-.radio-label::after {
-  background-image: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2213%22%20height%3D%2213%22%20viewBox%3D%220%200%2013%2013%22%20enable-background%3D%22new%200%200%2013%2013%22%20xml%3Aspace%3D%22preserve%22%3E%3Ccircle%20fill%3D%22%23424242%22%20cx%3D%226.5%22%20cy%3D%226.5%22%20r%3D%226.5%22%2F%3E%3C%2Fsvg%3E");
-  background-size: 8px; }
-
-.select {
-  position: relative;
-  z-index: 1;
-  padding-right: 40px; }
-
-.select-wrap {
-  position: relative; }
-  .select-wrap::after {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    z-index: 2;
-    width: 40px;
-    background-image: url("data:image/svg+xml,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20version%3D%221.1%22%20x%3D%220%22%20y%3D%220%22%20width%3D%2213%22%20height%3D%2211.3%22%20viewBox%3D%220%200%2013%2011.3%22%20enable-background%3D%22new%200%200%2013%2011.3%22%20xml%3Aspace%3D%22preserve%22%3E%3Cpolygon%20fill%3D%22%23424242%22%20points%3D%226.5%2011.3%203.3%205.6%200%200%206.5%200%2013%200%209.8%205.6%20%22%2F%3E%3C%2Fsvg%3E");
-    background-position: center;
-    background-size: 10px;
-    background-repeat: no-repeat;
-    content: "";
-    pointer-events: none; }
-
-.textarea {
-  min-height: 100px; }
-
-.button {
-  padding: 10px;
-  background-color: lightgray; }
-  .button:focus {
-    background-color: darkgray; }
-  .button:hover {
-    background-color: gray; }
-  .button:active {
-    background-color: dimgray; }
-
-.vertical-center {
-  font-size: 0; }
-  .vertical-center:before {
-    display: inline-block;
-    height: 100%;
-    content: "";
-    vertical-align: middle; }
-  .vertical-center > * {
-    font-size: 1rem;
-    display: inline-block;
-    vertical-align: middle; }
-
-.clearfix:after {
-  content: "";
-  display: table;
-  clear: both; }
-
-/*
- * Hide visually and from screen readers:
- * http://juicystudio.com/article/screen-readers-display-none.php
- */
-.hidden {
-  display: none !important;
-  visibility: hidden; }
-
-/*
- * Hide only visually, but have it available for screen readers:
- * http://snook.ca/archives/html_and_css/hiding-content-for-accessibility
- */
-.visuallyhidden {
-  border: 0;
-  clip: rect(0 0 0 0);
-  height: 1px;
-  margin: -1px;
-  overflow: hidden;
-  padding: 0;
-  position: absolute;
-  width: 1px; }
-
-/*
- * Extends the .visuallyhidden class to allow the element
- * to be focusable when navigated to via the keyboard:
- * https://www.drupal.org/node/897638
- */
-.visuallyhidden.focusable:active,
-.visuallyhidden.focusable:focus {
-  clip: auto;
-  height: auto;
-  margin: 0;
-  overflow: visible;
-  position: static;
-  width: auto; }
-
-/*
- * Hide visually and from screen readers, but maintain layout
- */
-.invisible {
-  visibility: hidden; }
-
-.left {
-  float: left !important; }
-
-.right {
-  float: right !important; }
-
-.align-left {
-  text-align: left !important; }
-
-.align-right {
-  text-align: right !important; }
-
-.align-center {
-  text-align: center !important; }
-
-.is-visible {
-  visibility: visible !important;
-  opacity: 1 !important; }
-
-.is-hidden {
-  visibility: hidden !important;
-  opacity: 0 !important; }

www/index.html

@@ -12,15 +12,15 @@
 		<link rel="apple-touch-icon" href="assets/images/apple-touch-icon.png">
 		<link rel="icon" href="assets/images/favicon.png">
 
-		<link rel="stylesheet" href="assets/styles/dist/main.css">
+		<link rel="stylesheet" href="assets/styles/main.css">
 	</head>
 	<body>
 
 		<h1 data-module="Generic, Title">Locomotive boilerplate</h1>
 
 		<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.0/jquery.min.js"></script>
-		<script>window.jQuery || document.write('<script src="assets/scripts/dist/jquery-2.2.0.min.js"><\/script>')</script>
-		<script src="assets/scripts/dist/vendors.js"></script>
-		<script src="assets/scripts/dist/app.js"></script>
+		<script>window.jQuery || document.write('<script src="assets/scripts/jquery-2.2.1.min.js"><\/script>')</script>
+		<script src="assets/scripts/vendors.js"></script>
+		<script src="assets/scripts/app.js"></script>
 	</body>
 </html>