Skip to content

Commit

Permalink
Merge pull request #4 from tmwagency/z-dev
Browse files Browse the repository at this point in the history
Zander's Kickoff updates
  • Loading branch information
mrmartineau committed Jul 6, 2013
2 parents a438f8f + b148cbc commit 56c084f
Show file tree
Hide file tree
Showing 70 changed files with 5,520 additions and 9,532 deletions.
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

# SASS #
########
.sass-cache
.sass-cache/
*.scssc


Expand All @@ -23,6 +23,9 @@ Thumbs.db
# Random
*.sublime-*

node_modules
dist
node_modules/
dist/
*.map

# Jekyll
_site/
29 changes: 29 additions & 0 deletions .svnignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# General #
###########
*.o *.lo *.la #*# .*.rej *.rej
.*~ *~ .#* .DS_Store thumbs.db
Thumbs.db *.bak *.class *.exe *.dll
*.mine *.obj *.ncb *.lib *.log
*.idb *.pdb *.ilk *.msi* .res *.pch *.suo
*.exp *.*~ *.~* ~*.* cvs CVS .CVS .cvs
release Release debug Debug
ignore Ignore bin Bin obj Obj
*.csproj.user *.user
*.generated.cs


# Kickoff added #
#################
*.sublime-*
node_modules/
dist/
*.map

# SASS #
########
.sass-cache/
*.scssc

# Jekyll #
##########
_site/
11 changes: 4 additions & 7 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ module.exports = function (grunt) {
pkg: require('./package'),

jshint: {
all: [
'Gruntfile.js',
'js/**/*.js'
],
all: jsFileList,
options: {
jshintrc: '.jshintrc'
}
Expand All @@ -34,7 +31,9 @@ module.exports = function (grunt) {
options: {
unixNewlines: true,
style: 'expanded',
lineNumbers: true
lineNumbers: false,
debugInfo : false,
precision : 8
},
files: {
'css/kickoff.css': 'scss/kickoff.scss',
Expand All @@ -55,8 +54,6 @@ module.exports = function (grunt) {

uglify: {
options: {
message: 'We are now ugly',

// mangle: Turn on or off mangling
mangle: true,

Expand Down
15 changes: 0 additions & 15 deletions crossdomain.xml

This file was deleted.

Loading

0 comments on commit 56c084f

Please sign in to comment.