diff --git a/.csscomb.json b/.csscomb.json index c051b056a..53ea6eff3 100644 --- a/.csscomb.json +++ b/.csscomb.json @@ -33,6 +33,7 @@ "-webkit-box-sizing", "-moz-box-sizing", "box-sizing", + "-webkit-appearance", "padding", "padding-top", "padding-right", @@ -46,8 +47,10 @@ "overflow", "overflow-x", "overflow-y", + "-webkit-overflow-scrolling", "-ms-overflow-x", "-ms-overflow-y", + "-ms-overflow-style", "clip", "clear", "font", @@ -124,18 +127,20 @@ "-webkit-user-select", "-moz-user-select", "-ms-user-select", + "-o-user-select", "user-select", "nav-index", "nav-up", "nav-right", "nav-down", "nav-left", - "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", "background", "background-color", + "background-image", "-ms-filter:\\'progid:DXImageTransform.Microsoft.gradient", "filter:progid:DXImageTransform.Microsoft.gradient", - "background-image", + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader", + "filter", "background-repeat", "background-attachment", "background-position", diff --git a/.editorconfig b/.editorconfig index cf8d7fa6e..0b008c957 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,3 +9,7 @@ end_of_line = lf charset = utf-8 trim_trailing_whitespace = true insert_final_newline = true + +[*.py] +indent_style = space +indent_size = 4 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index fbafd25b2..338795ec9 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -106,7 +106,7 @@ included in the project: # Clone your fork of the repo into the current directory git clone https://github.com//bootstrap.git # Navigate to the newly cloned directory - cd html5-boilerplate + cd bootstrap # Assign the original repo to a remote called "upstream" git remote add upstream https://github.com/twbs/bootstrap.git ``` diff --git a/Gruntfile.js b/Gruntfile.js index 04ff10a10..6107ecafd 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -18,8 +18,8 @@ module.exports = function (grunt) { banner: '/*!\n' + ' * Bootstrap v<%= pkg.version %> (<%= pkg.homepage %>)\n' + ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + - ' * Licensed under MIT (<%= _.pluck(pkg.licenses, "url").join(", ") %>)\n' + - ' */\n\n', + ' * Licensed under <%= _.pluck(pkg.licenses, "type") %> (<%= _.pluck(pkg.licenses, "url") %>)\n' + + ' */\n', jqueryCheck: 'if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery") }\n\n', // Task configuration. @@ -64,12 +64,16 @@ module.exports = function (grunt) { options: { csslintrc: '.csslintrc' }, - src: ['dist/css/bootstrap.css', 'dist/css/bootstrap-theme.css'] + src: [ + 'dist/css/bootstrap.css', + 'dist/css/bootstrap-theme.css', + 'docs-assets/css/docs.css' + ] }, concat: { options: { - banner: '<%= banner %><%= jqueryCheck %>', + banner: '<%= banner %>\n<%= jqueryCheck %>', stripBanners: false }, bootstrap: { @@ -92,15 +96,24 @@ module.exports = function (grunt) { }, uglify: { - options: { - banner: '<%= banner %>', - report: 'min' - }, bootstrap: { + options: { + banner: '<%= banner %>\n', + report: 'min' + }, src: ['<%= concat.bootstrap.dest %>'], dest: 'dist/js/<%= pkg.name %>.min.js' }, customize: { + options: { + banner: '/*!\n' + + ' * Bootstrap Docs (<%= pkg.homepage %>)\n' + + ' * Copyright <%= grunt.template.today("yyyy") %> <%= pkg.author %>\n' + + ' * Licensed under the Creative Commons Attribution 3.0 Unported License. For\n' + + ' * details, see http://creativecommons.org/licenses/by/3.0/.\n' + + ' */\n', + report: 'min' + }, src: [ 'docs-assets/js/less.js', 'docs-assets/js/jszip.js', @@ -316,9 +329,8 @@ module.exports = function (grunt) { // Use any line that starts with ".glyphicon-" and capture the class name var iconClassName = /^\.(glyphicon-[^\s]+)/ - var glyphiconsData = '# Generated on ' + (new Date()) + '\n' + - '# **Don\'t edit this directly!**\n' + - '# Look at the \'build-glyphicons-data\' task in Gruntfile.js\n\n'; + var glyphiconsData = '# This file is generated via Grunt task. **Do not edit directly.** \n' + + '# See the \'build-glyphicons-data\' task in Gruntfile.js.\n\n'; for (var i = 0, len = glpyhiconsLines.length; i < len; i++) { var match = glpyhiconsLines[i].match(iconClassName) diff --git a/README.md b/README.md index 013dab276..53a8d0532 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png)](https://david-dm.org/twbs/bootstrap#info=devDependencies) +# [Bootstrap](http://getbootstrap.com) [![Build Status](https://secure.travis-ci.org/twbs/bootstrap.png)](http://travis-ci.org/twbs/bootstrap) [![devDependency Status](https://david-dm.org/twbs/bootstrap/dev-status.png?theme=shields.io)](https://david-dm.org/twbs/bootstrap#info=devDependencies) [![Selenium Test Status](https://saucelabs.com/browser-matrix/bootstrap.svg)](https://saucelabs.com/u/bootstrap) Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created by [Mark Otto](http://twitter.com/mdo) and [Jacob Thornton](http://twitter.com/fat), and maintained by the [core team](https://github.com/twbs?tab=members) with the massive support and involvement of the community. @@ -21,7 +21,7 @@ To get started, check out ! Three quick start options are available: -- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.1.0.zip). +- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.0.3.zip). - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. - Install with [Bower](http://bower.io): `bower install bootstrap`. @@ -97,10 +97,10 @@ When completed, you'll be able to run the various Grunt commands provided from t ### Available Grunt commands #### Build - `grunt` -Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).** +Run `grunt` to run tests locally and compile the CSS and JavaScript into `/dist`. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).** #### Only compile CSS and JavaScript - `grunt dist` -`grunt dist` creates the `/dist` directory with compiled files. **Uses [recess](http://twitter.github.io/recess/) and [UglifyJS](http://lisperator.net/uglifyjs/).** +`grunt dist` creates the `/dist` directory with compiled files. **Uses [Less](http://lesscss.org/) and [UglifyJS](http://lisperator.net/uglifyjs/).** #### Tests - `grunt test` Runs [JSHint](http://jshint.com) and [QUnit](http://qunitjs.com/) tests headlessly in [PhantomJS](http://phantomjs.org/) (used for CI). diff --git a/_config.yml b/_config.yml index baa1344c9..ae7b5a1e6 100644 --- a/_config.yml +++ b/_config.yml @@ -7,20 +7,36 @@ permalink: pretty # Server destination: ./_gh_pages -exclude: [".editorconfig", ".gitignore", "bower.json", "composer.json", "CONTRIBUTING.md", "CNAME", "LICENSE", "Gruntfile.js", "package.json", "node_modules", "README.md", "less"] port: 9001 +exclude: +- ".editorconfig" +- ".gitignore" +- "bower.json" +- "CNAME" +- "composer.json" +- "CONTRIBUTING.md" +- "DOCS-LICENSE" +- "Gruntfile.js" +- "less" +- "LICENSE" +- "node_modules" +- "package.json" +- "README.md" +- "sauce_browsers.yml" +- "test-infra" # Custom vars -current_version: 3.1.0 +current_version: 3.0.3 repo: https://github.com/twbs/bootstrap -download_source: https://github.com/twbs/bootstrap/archive/v3.1.0.zip -download_dist: https://github.com/twbs/bootstrap/releases/download/v3.1.0/bootstrap-3.1.0-dist.zip -download_sass: https://github.com/twbs/bootstrap-sass/archive/v3.1.0.0.tar.gz +download_source: https://github.com/twbs/bootstrap/archive/v3.0.3.zip +download_dist: https://github.com/twbs/bootstrap/releases/download/v3.0.3/bootstrap-3.0.3-dist.zip +download_sass: https://github.com/twbs/bootstrap-sass/archive/v3.0.3.0.tar.gz blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com +sass_repo: https://github.com/twbs/bootstrap-sass -cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap.min.css -cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.1.0/css/bootstrap-theme.min.css -cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.1.0/js/bootstrap.min.js +cdn_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap.min.css +cdn_theme_css: //netdna.bootstrapcdn.com/bootstrap/3.0.3/css/bootstrap-theme.min.css +cdn_js: //netdna.bootstrapcdn.com/bootstrap/3.0.3/js/bootstrap.min.js diff --git a/_data/glyphicons.yml b/_data/glyphicons.yml index a894f8bf6..80b4c9b08 100644 --- a/_data/glyphicons.yml +++ b/_data/glyphicons.yml @@ -1,6 +1,5 @@ -# Generated on Wed Dec 18 2013 20:14:37 GMT-0800 (PST) -# **Don't edit this directly!** -# Look at the 'build-glyphicons-data' task in Gruntfile.js +# This file is generated via Grunt task. **Do not edit directly.** +# See the 'build-glyphicons-data' task in Gruntfile.js. - glyphicon-asterisk - glyphicon-plus diff --git a/_includes/header.html b/_includes/header.html index 18d7660b8..1275979f7 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -24,12 +24,12 @@ - +