diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index ba2bfc52d..060a3bd91 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -48,7 +48,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso
- Multiple-line approach (one property and value per line)
- Always a space after a property's colon (.e.g, `display: block;` and not `display:block;`)
- End all lines with a semi-colon
-- For multiple, comma-separated selectors, place each selector on it's own line
+- For multiple, comma-separated selectors, place each selector on its own line
- Attribute selectors, like `input[type="text"]` should always wrap the attribute's value in double quotes, for consistency and safety (see this [blog post on unquoted attribute values](http://mathiasbynens.be/notes/unquoted-attribute-values) that can lead to XSS attacks).
### JS
diff --git a/Gruntfile.js b/Gruntfile.js
index 7aad9b339..de6db2f3c 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,127 +1,144 @@
/* jshint node: true */
+
module.exports = function(grunt) {
- "use strict";
+ "use strict";
- // Project configuration.
- grunt.initConfig({
- // Metadata.
- pkg: grunt.file.readJSON('package.json'),
- banner: '/**\n' +
- '* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
- '* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
- '* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
- '*/\n',
- jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
- // Task configuration.
- clean: {
- dist: ['dist']
+ // Project configuration.
+ grunt.initConfig({
+
+ // Metadata.
+ pkg: grunt.file.readJSON('package.json'),
+ banner: '/**\n' +
+ '* <%= pkg.name %>.js v<%= pkg.version %> by @fat and @mdo\n' +
+ '* Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' +
+ '* <%= _.pluck(pkg.licenses, "url").join(", ") %>\n' +
+ '*/\n',
+ jqueryCheck: 'if (!jQuery) { throw new Error(\"Bootstrap requires jQuery\") }\n\n',
+
+ // Task configuration.
+ clean: {
+ dist: ['dist']
+ },
+
+ jshint: {
+ options: {
+ jshintrc: 'js/.jshintrc'
+ },
+ gruntfile: {
+ src: 'Gruntfile.js'
+ },
+ src: {
+ src: ['js/*.js']
+ },
+ test: {
+ src: ['js/tests/unit/*.js']
+ }
+ },
+ concat: {
+ options: {
+ banner: '<%= banner %><%= jqueryCheck %>',
+ stripBanners: false
+ },
+ bootstrap: {
+ src: [
+ 'js/transition.js',
+ 'js/alert.js',
+ 'js/button.js',
+ 'js/carousel.js',
+ 'js/collapse.js',
+ 'js/dropdown.js',
+ 'js/modal.js',
+ 'js/tooltip.js',
+ 'js/popover.js',
+ 'js/scrollspy.js',
+ 'js/tab.js',
+ 'js/affix.js'
+ ],
+ dest: 'dist/js/<%= pkg.name %>.js'
+ }
+ },
+ uglify: {
+ options: {
+ banner: '<%= banner %>'
+ },
+ bootstrap: {
+ src: ['<%= concat.bootstrap.dest %>'],
+ dest: 'dist/js/<%= pkg.name %>.min.js'
+ }
+ },
+
+ recess: {
+ options: {
+ compile: true
+ },
+ bootstrap: {
+ src: ['less/bootstrap.less'],
+ dest: 'dist/css/<%= pkg.name %>.css'
+ },
+ min: {
+ options: {
+ compress: true
},
- concat: {
- options: {
- banner: '<%= banner %><%= jqueryCheck %>',
- stripBanners: false
- },
- bootstrap: {
- src: ['js/transition.js', 'js/alert.js', 'js/button.js', 'js/carousel.js', 'js/collapse.js', 'js/dropdown.js', 'js/modal.js', 'js/tooltip.js', 'js/popover.js', 'js/scrollspy.js', 'js/tab.js', 'js/affix.js'],
- dest: 'dist/js/<%= pkg.name %>.js'
- }
- },
- jshint: {
- options: {
- jshintrc: 'js/.jshintrc'
- },
- gruntfile: {
- src: 'Gruntfile.js'
- },
- src: {
- src: ['js/*.js']
- },
- test: {
- src: ['js/tests/unit/*.js']
- }
- },
- recess: {
- options: {
- compile: true
- },
- bootstrap: {
- files: {
- 'dist/css/bootstrap.css': ['less/bootstrap.less']
- }
- },
- min: {
- options: {
- compress: true
- },
- files: {
- 'dist/css/bootstrap.min.css': ['less/bootstrap.less']
- }
- }
- },
- uglify: {
- options: {
- banner: '<%= banner %>'
- },
- bootstrap: {
- files: {
- 'dist/js/<%= pkg.name %>.min.js': ['<%= concat.bootstrap.dest %>']
- }
- }
- },
- qunit: {
- options: {
- inject: 'js/tests/unit/phantom.js'
- },
- files: ['js/tests/*.html']
- },
- connect: {
- server: {
- options: {
- port: 3000,
- base: '.'
- }
- }
- },
- watch: {
- src: {
- files: '<%= jshint.src.src %>',
- tasks: ['jshint:src', 'qunit']
- },
- test: {
- files: '<%= jshint.test.src %>',
- tasks: ['jshint:test', 'qunit']
- },
- recess: {
- files: 'less/*.less',
- tasks: ['recess']
- }
+ src: ['less/bootstrap.less'],
+ dest: 'dist/css/<%= pkg.name %>.min.css'
+ }
+ },
+
+ qunit: {
+ options: {
+ inject: 'js/tests/unit/phantom.js'
+ },
+ files: ['js/tests/*.html']
+ },
+ connect: {
+ server: {
+ options: {
+ port: 3000,
+ base: '.'
}
- });
+ }
+ },
+
+ watch: {
+ src: {
+ files: '<%= jshint.src.src %>',
+ tasks: ['jshint:src', 'qunit']
+ },
+ test: {
+ files: '<%= jshint.test.src %>',
+ tasks: ['jshint:test', 'qunit']
+ },
+ recess: {
+ files: 'less/*.less',
+ tasks: ['recess']
+ }
+ }
+ });
- // These plugins provide necessary tasks.
- grunt.loadNpmTasks('grunt-contrib-connect');
- grunt.loadNpmTasks('grunt-contrib-clean');
- grunt.loadNpmTasks('grunt-contrib-concat');
- grunt.loadNpmTasks('grunt-contrib-jshint');
- grunt.loadNpmTasks('grunt-contrib-uglify');
- grunt.loadNpmTasks('grunt-contrib-qunit');
- grunt.loadNpmTasks('grunt-contrib-watch');
- grunt.loadNpmTasks('grunt-recess');
+ // These plugins provide necessary tasks.
+ grunt.loadNpmTasks('grunt-contrib-clean');
+ grunt.loadNpmTasks('grunt-contrib-concat');
+ grunt.loadNpmTasks('grunt-contrib-connect');
+ grunt.loadNpmTasks('grunt-contrib-jshint');
+ grunt.loadNpmTasks('grunt-contrib-qunit');
+ grunt.loadNpmTasks('grunt-contrib-uglify');
+ grunt.loadNpmTasks('grunt-contrib-watch');
+ grunt.loadNpmTasks('grunt-recess');
- // Test task.
- grunt.registerTask('test', ['jshint', 'qunit']);
+ // Test task.
+ grunt.registerTask('test', ['jshint', 'qunit']);
- // JS distribution task.
- grunt.registerTask('dist-js', ['concat', 'uglify']);
+ // JS distribution task.
+ grunt.registerTask('dist-js', ['concat', 'uglify']);
- // CSS distribution task.
- grunt.registerTask('dist-css', ['recess']);
+ // CSS distribution task.
+ grunt.registerTask('dist-css', ['recess']);
- // Full distribution task.
- grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']);
+ // Full distribution task.
+ grunt.registerTask('dist', ['clean', 'dist-css', 'dist-js']);
- // Default task.
- grunt.registerTask('default', ['test', 'dist']);
+ // Default task.
+ grunt.registerTask('default', ['test', 'dist']);
};
diff --git a/_includes/ads.html b/_includes/ads.html
index 495e7ba47..ba4775f5e 100644
--- a/_includes/ads.html
+++ b/_includes/ads.html
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/_includes/footer.html b/_includes/footer.html
index 47a671b26..83ff87e26 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -4,7 +4,7 @@
-
+
@@ -15,7 +15,6 @@
var _gauges = _gauges || [];
(function() {
var t = document.createElement('script');
- t.type = 'text/javascript';
t.async = true;
t.id = 'gauges-tracker';
t.setAttribute('data-site-id', '4f0dc9fef5a1f55508000013');
diff --git a/_includes/header.html b/_includes/header.html
index b5eff5f5e..827b1c2c9 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -31,12 +31,12 @@
-
-
+