diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 95a003ecf4..8bb3ccde0c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -19,7 +19,7 @@ and [submitting pull requests](#pull-requests), but please respect the following restrictions: * Please **do not** use the issue tracker for personal support requests. Stack - Overflow ([`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3) tag) or [IRC](README.md#community) are better places to get help. + Overflow ([`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3) tag), [Slack](https://bootstrap-slack.herokuapp.com/) or [IRC](README.md#community) are better places to get help. * Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others. @@ -65,7 +65,7 @@ Guidelines for bug reports: latest `master` or development branch in the repository. 3. **Isolate the problem** — ideally create a [reduced test - case](http://css-tricks.com/6263-reduced-test-cases/) and a live example. + case](https://css-tricks.com/reduced-test-cases/) and a live example. [This JS Bin](http://jsbin.com/lefey/1/edit?html,output) is a helpful template. @@ -148,7 +148,7 @@ documentation source files and is managed separately by the Bootstrap Core Team. Adhering to the following process is the best way to get your work included in the project: -1. [Fork](http://help.github.com/fork-a-repo/) the project, clone your fork, +1. [Fork](https://help.github.com/fork-a-repo/) the project, clone your fork, and configure the remotes: ```bash diff --git a/Gruntfile.js b/Gruntfile.js index 31540205e9..70c52fe5ec 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -492,7 +492,7 @@ module.exports = function (grunt) { grunt.registerTask('lint-docs-js', ['jscs:assets']); grunt.registerTask('docs', ['docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs']); - grunt.registerTask('docs-github', ['jekyll:github']); + grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']); // Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json). // This task should be run and the updated file should be committed whenever Bootstrap's dependencies change. diff --git a/README.md b/README.md index 13785757b1..8864865c83 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,11 @@ # [Bootstrap](http://getbootstrap.com) -![Bower version](https://img.shields.io/bower/v/bootstrap.svg?style=flat) -[![npm version](https://img.shields.io/npm/v/bootstrap.svg?style=flat)](https://www.npmjs.com/package/bootstrap) -[![Gem version](https://img.shields.io/gem/v/bootstrap.svg?style=flat)](https://rubygems.org/gems/bootstrap) -[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg?style=flat)](https://travis-ci.org/twbs/bootstrap) -[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg?style=flat)](https://david-dm.org/twbs/bootstrap#info=devDependencies) + +[![Slack](https://bootstrap-slack.herokuapp.com/badge.svg)](https://bootstrap-slack.herokuapp.com) +![Bower version](https://img.shields.io/bower/v/bootstrap.svg) +[![npm version](https://img.shields.io/npm/v/bootstrap.svg)](https://www.npmjs.com/package/bootstrap) +[![Gem version](https://img.shields.io/gem/v/bootstrap.svg)](https://rubygems.org/gems/bootstrap) +[![Build Status](https://img.shields.io/travis/twbs/bootstrap/master.svg)](https://travis-ci.org/twbs/bootstrap) +[![devDependency Status](https://img.shields.io/david/dev/twbs/bootstrap.svg)](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](https://twitter.com/mdo) and [Jacob Thornton](https://twitter.com/fat), and maintained by the [core team](https://github.com/orgs/twbs/people) with the massive support and involvement of the community. @@ -25,7 +27,7 @@ To get started, check out ! Several quick start options are available: -- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.4.zip). +- [Download the latest release](https://github.com/twbs/bootstrap/archive/v3.3.5.zip). - Clone the repo: `git clone https://github.com/twbs/bootstrap.git`. - Install with [Bower](http://bower.io): `bower install bootstrap`. - Install with [npm](https://www.npmjs.com): `npm install bootstrap`. @@ -49,8 +51,7 @@ bootstrap/ └── bootstrap.min.js ``` -We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developers.google.com/chrome-developer-tools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. - +We provide compiled CSS and JS (`bootstrap.*`), as well as compiled and minified CSS and JS (`bootstrap.min.*`). CSS [source maps](https://developer.chrome.com/devtools/docs/css-preprocessors) (`bootstrap.*.map`) are available for use with certain browsers' developer tools. ## Bugs and feature requests @@ -92,12 +93,13 @@ Editor preferences are available in the [editor config](https://github.com/twbs/ ## Community -Keep track of development and community news. +Get updates on Bootstrap's development and chat with the project maintainers and community members. - Follow [@getbootstrap on Twitter](https://twitter.com/getbootstrap). - Read and subscribe to [The Official Bootstrap Blog](http://blog.getbootstrap.com). +- Join [the official Slack room](https://bootstrap-slack.herokuapp.com). - Chat with fellow Bootstrappers in IRC. On the `irc.freenode.net` server, in the `##bootstrap` channel. -- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](http://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). +- Implementation help may be found at Stack Overflow (tagged [`twitter-bootstrap-3`](https://stackoverflow.com/questions/tagged/twitter-bootstrap-3)). - Developers should use the keyword `bootstrap` on packages which modify or add to the functionality of Bootstrap when distributing through [npm](https://www.npmjs.com/browse/keyword/bootstrap) or similar delivery mechanisms for maximum discoverability. diff --git a/_config.yml b/_config.yml index 6dd22ada88..94448f8309 100644 --- a/_config.yml +++ b/_config.yml @@ -24,20 +24,14 @@ repo: https://github.com/twbs/bootstrap sass_repo: https://github.com/twbs/bootstrap-sass download: - source: https://github.com/twbs/bootstrap/archive/v3.3.4.zip - dist: https://github.com/twbs/bootstrap/releases/download/v3.3.4/bootstrap-3.3.4-dist.zip - sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.4.tar.gz + source: https://github.com/twbs/bootstrap/archive/v3.3.5.zip + dist: https://github.com/twbs/bootstrap/releases/download/v3.3.5/bootstrap-3.3.5-dist.zip + sass: https://github.com/twbs/bootstrap-sass/archive/v3.3.5.tar.gz blog: http://blog.getbootstrap.com expo: http://expo.getbootstrap.com cdn: - css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css - js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js - jquery: //code.jquery.com/jquery-2.1.1.min.js - -bug: - firefox: https://bugzilla.mozilla.org/show_bug.cgi?id= - webkit: https://bugs.webkit.org/show_bug.cgi?id= - chrome: https://code.google.com/p/chromium/issues/detail?id= - github: https://github.com/twbs/bootstrap/issues/ + css: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css + css_theme: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap-theme.min.css + js: https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.min.js diff --git a/_reset-text.scss b/_reset-text.scss new file mode 100644 index 0000000000..c78db03144 --- /dev/null +++ b/_reset-text.scss @@ -0,0 +1,18 @@ +@mixin reset-text { + font-family: $font-family-base; + // We deliberately do NOT reset font-size. + font-style: normal; + font-weight: normal; + letter-spacing: normal; + line-break: auto; + line-height: $line-height-base; + text-align: left; // Fallback for where `start` is not supported + text-align: start; + text-decoration: none; + text-shadow: none; + text-transform: none; + white-space: normal; + word-break: normal; + word-spacing: normal; + word-wrap: normal; +} diff --git a/bower.json b/bower.json index 27606caa81..795aa445a9 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,6 @@ { "name": "bootstrap", "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.", - "version": "3.3.4", "keywords": [ "css", "js", @@ -13,9 +12,10 @@ "web" ], "homepage": "http://getbootstrap.com", + "license": "MIT", + "moduleType": "globals", "main": [ "scss/bootstrap.scss", - "dist/css/bootstrap.css", "dist/js/bootstrap.js" ], "ignore": [ diff --git a/docs/_data/browser-bugs.yml b/docs/_data/browser-bugs.yml index 9888b5a3ba..63f7b3248b 100644 --- a/docs/_data/browser-bugs.yml +++ b/docs/_data/browser-bugs.yml @@ -88,6 +88,16 @@ origin: > Bootstrap#15832 +- + browser: > + Chrome + summary: > + Focus ring of image map within a modal is displayed in the wrong location. + upstream_bug: > + Chromium#475128 + origin: > + Bootstrap#16180 + - browser: > Chrome @@ -128,6 +138,16 @@ origin: > Bootstrap#16022 +- + browser: > + Chrome + summary: > + `width: 1%` on nested table cell causes its table to hog horizontal space. + upstream_bug: > + Chromium#427994 + origin: > + Bootstrap#16372 + - browser: > Chrome (Windows & Linux) @@ -138,6 +158,16 @@ origin: > Bootstrap#15298 +- + browser: > + Safari + summary: > + `width: 1%` on nested table cell causes its table to hog horizontal space. + upstream_bug: > + WebKit#144696, Safari#20839572 + origin: > + Bootstrap#16372 + - browser: > Safari (OS X) @@ -200,6 +230,26 @@ origin: > Bootstrap#15832 +- + browser: > + Safari (OS X) + summary: > + Focus ring of image map within a modal is displayed in the wrong location. + upstream_bug: > + WebKit#143527 + origin: > + Bootstrap#16180 + +- + browser: > + Safari (OS X) + summary: > + Unnecessary line-wrapping of `.navbar-brand` text for no apparent reason + upstream_bug: > + WebKit#144990, Safari#20950962 + origin: > + Bootstrap#15998 + - browser: > Safari (iOS) diff --git a/docs/_data/translations.yml b/docs/_data/translations.yml index 3879fc34ce..b073a6631e 100644 --- a/docs/_data/translations.yml +++ b/docs/_data/translations.yml @@ -26,7 +26,7 @@ - name: Korean code: ko description: Bootstrap 한국어 - url: http://bootstrapk.com/BS3/ + url: http://bootstrapk.com/ - name: Russian code: ru diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 7b4b8d2d19..f1b8db66ab 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -35,7 +35,7 @@ - + {% if site.github %} diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html index c20fcaa9e7..f7a3329b35 100644 --- a/docs/_includes/social-buttons.html +++ b/docs/_includes/social-buttons.html @@ -1,10 +1,10 @@