diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2cbd6e32c2..fcd95bf7a7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -36,7 +36,7 @@ We only accept issues that are bug reports or feature requests. Bugs must be iso ### CSS -- Adhere to the [Recess CSS property order](http://markdotto.com/2011/11/29/css-property-order/) +- Adhere to the [RECESS CSS property order](http://markdotto.com/2011/11/29/css-property-order/) - 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 diff --git a/Gruntfile.js b/Gruntfile.js index 4edad59ae2..41f7ed3315 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,6 +3,7 @@ module.exports = function(grunt) { "use strict"; + var btoa = require('btoa') // Project configuration. grunt.initConfig({ @@ -156,6 +157,7 @@ module.exports = function(grunt) { // These plugins provide necessary tasks. + grunt.loadNpmTasks('browserstack-runner'); grunt.loadNpmTasks('grunt-contrib-clean'); grunt.loadNpmTasks('grunt-contrib-concat'); grunt.loadNpmTasks('grunt-contrib-connect'); @@ -167,7 +169,6 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-html-validation'); grunt.loadNpmTasks('grunt-jekyll'); grunt.loadNpmTasks('grunt-recess'); - grunt.loadNpmTasks('browserstack-runner'); // Docs HTML validation task grunt.registerTask('validate-html', ['jekyll', 'validation']); @@ -209,7 +210,8 @@ module.exports = function(grunt) { return type == 'fonts' ? true : new RegExp('\\.' + type + '$').test(path) }) .forEach(function (path) { - return files[path] = fs.readFileSync(type + '/' + path, 'utf8') + var fullPath = type + '/' + path + return files[path] = (type == 'fonts' ? btoa(fs.readFileSync(fullPath)) : fs.readFileSync(fullPath, 'utf8')) }) return 'var __' + type + ' = ' + JSON.stringify(files) + '\n' } diff --git a/README.md b/README.md index 25e62ebf58..007d4a2fee 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ To get started, check out [http://getbootstrap.com](http://getbootstrap.com)! Three quick start options are available: * [Download the latest release](https://github.com/twbs/bootstrap/releases/tag/v3.0.0). -* Clone the repo: `git clone git://github.com/twbs/bootstrap.git`. +* Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. * Install with [Bower](http://bower.io): `bower install bootstrap`. Read the [Getting Started page](http://getbootstrap.com/getting-started/) for information on the framework contents, templates and examples, and more. diff --git a/_includes/footer.html b/_includes/footer.html index 9e66c58a10..7f9f8f103b 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -1,7 +1,7 @@ - + diff --git a/_includes/header.html b/_includes/header.html index 09f498bfbe..b25f2cf43a 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -21,7 +21,7 @@ diff --git a/_includes/nav-css.html b/_includes/nav-css.html index ae5962c7c7..543d004f30 100644 --- a/_includes/nav-css.html +++ b/_includes/nav-css.html @@ -12,6 +12,7 @@
  • Grid system