Skip to content

Commit 55997bc

Browse files
mrmartineaumrmartineau
committed
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
2 parents bb4ca72 + d2ac0c5 commit 55997bc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+1753
-6678
lines changed

‎.gitignore‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,25 @@ assets/temp/**/*
1010

1111

1212
# CSS & Sass
13-
# css/*.css
1413
.sass-cache/
1514
*.scssc
1615

1716

1817
# Dependencies
19-
# Bower dependencies directory. comment this line to commit them.
20-
bower_modules/*
21-
# Node modules directory. comment this line to commit them.
18+
# # Node modules directory. comment this line to commit them.
2219
node_modules/*
23-
logs
24-
*.log
2520

2621

27-
# Tooling
28-
# Photobox visual regression testing
29-
photobox/
30-
# Generated test files
31-
testing/
22+
# PHP
23+
.idea
24+
25+
26+
# .NET
3227

3328

34-
# Sublime Text project files
29+
# IDE generated files
3530
*.sublime-*
36-
# Jekyll compilation directory
37-
_site/
31+
.vscode
3832

3933

4034
# OS generated files
@@ -45,3 +39,9 @@ _site/
4539
.Trashes
4640
ehthumbs.db
4741
Thumbs.db
42+
43+
44+
# Miscellaneous
45+
_site/ # Jekyll compilation directory
46+
logs
47+
*.log

0 commit comments

Comments
 (0)