Skip to content

B
bootstrap
Commit 939c9590 authored by Mark Otto's avatar Mark Otto
Browse files
Options

Merge branch '3.0.0-wip' of github.com:twbs/bootstrap into 3.0.0-wip

parents 7b6f85c1 908f4c34
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
Gruntfile.js
View file @ 939c9590
/* jshint node: true */
module.exports = function(grunt) { module.exports = function(grunt) {
"use strict";
// Project configuration. // Project configuration.
grunt.initConfig({ grunt.initConfig({
...@@ -26,6 +28,7 @@ module.exports = function(grunt) { ...@@ -26,6 +28,7 @@ module.exports = function(grunt) {
}, },
jshint: { jshint: {
options: { options: {
ignores: [],// HACK: workaround https://github.com/gruntjs/grunt-contrib-jshint/issues/86
jshintrc: 'js/.jshintrc' jshintrc: 'js/.jshintrc'
}, },
gruntfile: { gruntfile: {
......
js/.jshintrc
View file @ 939c9590
...@@ -3,9 +3,11 @@ ...@@ -3,9 +3,11 @@
"laxcomma" : true, "laxcomma" : true,
"laxbreak" : true, "laxbreak" : true,
"browser" : true, "browser" : true,
"eqeqeq" : false,
"eqnull" : true, "eqnull" : true,
"debug" : true, "debug" : true,
"devel" : true, "devel" : true,
"curly" : false,
"boss" : true, "boss" : true,
"expr" : true, "expr" : true,
"asi" : true "asi" : true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment