Skip to content

Commit

Permalink
Fix code linting after deps update. Closes #385
Browse files Browse the repository at this point in the history
  • Loading branch information
peterblazejewicz authored and thenickcox committed Mar 31, 2015
1 parent 5499103 commit 2ae8da4
Showing 1 changed file with 49 additions and 58 deletions.
107 changes: 49 additions & 58 deletions gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ module.exports = function(grunt) {
height: 800
},
home: {
options: {
css: [
'dist/styles/marionette.css'
]
},
src: 'dist/index.html',
dest: 'dist/index.html'
options: {
css: [
'dist/styles/marionette.css'
]
},
src: 'dist/index.html',
dest: 'dist/index.html'
},
inspector: {
options: {
css: [
'dist/styles/inspector.css'
]
},
src: 'dist/inspector/index.html',
dest: 'dist/inspector/index.html'
options: {
css: [
'dist/styles/inspector.css'
]
},
src: 'dist/inspector/index.html',
dest: 'dist/inspector/index.html'
}
},
concat: {
Expand Down Expand Up @@ -110,47 +110,39 @@ module.exports = function(grunt) {

copy: {
assets: {
files: [
{
expand: true,
cwd: 'src/',
src: ['images/**/*', '!images/**/*.{png,jpg,gif,ico}'],
dest: 'dist/'
},
{
expand: true,
src: ['bower_components/**/*'],
dest: 'dist/'
},
{
cwd: 'src/',
expand: true,
src: ['js/docs.js'],
dest: 'dist'
},
{
expand: true,
cwd: 'bower_components/jquery/dist',
src: ['jquery.min.map'],
dest: 'dist/js'
}
]
files: [{
expand: true,
cwd: 'src/',
src: ['images/**/*', '!images/**/*.{png,jpg,gif,ico}'],
dest: 'dist/'
}, {
expand: true,
src: ['bower_components/**/*'],
dest: 'dist/'
}, {
cwd: 'src/',
expand: true,
src: ['js/docs.js'],
dest: 'dist'
}, {
expand: true,
cwd: 'bower_components/jquery/dist',
src: ['jquery.min.map'],
dest: 'dist/js'
}]
},
main: {
files: [
{
cwd: 'src/',
expand: true,
src: ['robots.txt'],
dest: 'dist/'
},
{
cwd: 'src/images/favicons',
expand: true,
src: ['**.*'],
dest: 'dist/'
}
]
files: [{
cwd: 'src/',
expand: true,
src: ['robots.txt'],
dest: 'dist/'
}, {
cwd: 'src/images/favicons',
expand: true,
src: ['**.*'],
dest: 'dist/'
}]
}
},

Expand Down Expand Up @@ -221,7 +213,7 @@ module.exports = function(grunt) {
},

sass: {
options:{
options: {
outputStyle: 'compressed'
},
dist: {
Expand All @@ -234,7 +226,7 @@ module.exports = function(grunt) {
}
},
dev: {
options:{
options: {
outputStyle: 'nested',
sourceMap: true
},
Expand Down Expand Up @@ -288,7 +280,7 @@ module.exports = function(grunt) {
'uglify:polyfills',
'copy',
'notify:postHTML'
]
]
},
gruntfile: {
files: 'gruntfile.js',
Expand Down Expand Up @@ -319,8 +311,7 @@ module.exports = function(grunt) {
options: {
data: function() {
return _.extend(
require('./src/data/locals.json'),
{
require('./src/data/locals.json'), {
VERSION: GittyCache.releaseTag || 'v.X.X.X',
books: require('./src/data/books.json'),
videos: require('./src/data/videos.json')
Expand Down

0 comments on commit 2ae8da4

Please sign in to comment.