Merge branch 'next'

* next: (136 commits) compile CSS 😁 add kickoff 'logo' in html fix comment only use one `<script>` element in `<head>` more info about cutting the mustard update npm deps marginally improve performance by caching another item remove return statement. this shouldn't have made it in Load shims using 'cutting the mustard' check instead of if lte ie9 Updating Grunt to include SCSS and JS linting (available by uncommenting in the build step) add semicolon compile scss change page name to Styleguide lowercase this remove whitespace change js bundle filename to `bundle.js` to make it more clear which js file is being served update humans update some grunt configs remove modernizr & html validation update gitignore ... Conflicts: package.json
TryKickoff · Nov 20, 2015 · 55997bc · 55997bc
2 parents bb4ca72 + d2ac0c5
commit 55997bc
Show file tree

Hide file tree

Showing 83 changed files with 1,753 additions and 6,678 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,31 +10,25 @@ assets/temp/**/*
 
 
 # CSS & Sass
-# css/*.css
 .sass-cache/
 *.scssc
 
 
 # Dependencies
- # Bower dependencies directory. comment this line to commit them.
-bower_modules/*
- # Node modules directory. comment this line to commit them.
+# # Node modules directory. comment this line to commit them.
 node_modules/*
-logs
-*.log
 
 
-# Tooling
-# Photobox visual regression testing
-photobox/
-# Generated test files
-testing/
+# PHP
+.idea
+
+
+# .NET
 
 
-# Sublime Text project files
+# IDE generated files
 *.sublime-*
-# Jekyll compilation directory
-_site/
+.vscode
 
 
 # OS generated files
@@ -45,3 +39,9 @@ _site/
 .Trashes
 ehthumbs.db
 Thumbs.db
+
+
+# Miscellaneous
+_site/ # Jekyll compilation directory
+logs
+*.log