Skip to content

Commit b80aff4

Browse files
levkowetzlevkowetz
committed
Merged in [13098] from lars@netapp.com:
 Update bootstrap to 3.3.7. - Legacy-Id: 13103 Note: SVN reference [13098] has been migrated to Git commit 00accc3
2 parents f553b3f + 00accc3 commit b80aff4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+5546
-1251
lines changed

‎bootstrap/CONTRIBUTING.md‎

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,16 @@ restrictions:
2424
* Please **do not** derail or troll issues. Keep the discussion on topic and
2525
respect the opinions of others.
2626

27+
* Please **do not** post comments consisting solely of "+1" or ":thumbsup:".
28+
Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments)
29+
instead. We reserve the right to delete comments which violate this rule.
30+
2731
* Please **do not** open issues or pull requests regarding the code in
2832
[`Normalize`](https://github.com/necolas/normalize.css) (open them in
2933
their respective repositories).
3034

31-
* Please **do not** open issues regarding the official themes offered on <http://themes.getbootstrap.com/>. Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`.
35+
* Please **do not** open issues regarding the official themes offered on <http://themes.getbootstrap.com/>.
36+
Instead, please email any questions or feedback regarding those themes to `themes AT getbootstrap DOT com`.
3237

3338

3439
## Issues and labels
@@ -37,7 +42,7 @@ Our bug tracker utilizes several labels to help organize and identify issues. He
3742

3843
- `browser bug` - Issues that are reported to us, but actually are the result of a browser-specific bug. These are diagnosed with reduced test cases and result in an issue opened on that browser's own bug tracker.
3944
- `confirmed` - Issues that have been confirmed with a reduced test case and identify a bug in Bootstrap.
40-
- `css` - Issues stemming from our compiled CSS or source Less files.
45+
- `css` - Issues stemming from our compiled CSS or source Less/Sass files.
4146
- `customizer` - Issues with our web-based Customizer.
4247
- `docs` - Issues for improving or updating our documentation.
4348
- `examples` - Issues involving the example templates included in our docs.
@@ -107,7 +112,7 @@ When feasible, we aim to report such upstream bugs to the relevant browser vendo
107112
| Mozilla | Firefox | Gecko | https://bugzilla.mozilla.org/enter_bug.cgi | "Core" is normally the right product option to choose. |
108113
| Apple | Safari | WebKit | https://bugs.webkit.org/enter_bug.cgi?product=WebKit <br> https://bugreport.apple.com | In Apple's bug reporter, choose "Safari" as the product. |
109114
| Google, Opera | Chrome, Chromium, Opera v15+ | Blink | https://code.google.com/p/chromium/issues/list | Click the "New issue" button. |
110-
| Microsoft | Internet Explorer / Edge | Trident/EdgeHTML | https://connect.microsoft.com/IE/feedback/LoadSubmitFeedbackForm | |
115+
| Microsoft | Edge | EdgeHTML | https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/ | |
111116

112117
### Issues bots
113118

@@ -116,7 +121,13 @@ When feasible, we aim to report such upstream bugs to the relevant browser vendo
116121

117122
## Feature requests
118123

119-
Feature requests are welcome. But take a moment to find out whether your idea
124+
Feature requests are welcome, but please note that they **must target
125+
[Bootstrap v4](https://github.com/twbs/bootstrap/tree/v4-dev),** because
126+
Bootstrap v3 is now in maintenance mode and is closed off to new features.
127+
This is so that we can focus our efforts on Bootstrap v4, the future of the
128+
framework.
129+
130+
Before opening a feature request, please take a moment to find out whether your idea
120131
fits with the scope and aims of the project. It's up to *you* to make a strong
121132
case to convince the project's developers of the merits of this feature. Please
122133
provide as much detail and context as possible.
@@ -133,13 +144,21 @@ implementing features, refactoring code, porting to a different language),
133144
otherwise you risk spending a lot of time working on something that the
134145
project's developers might not want to merge into the project.
135146

147+
In particular, **pull requests that add new features to Bootstrap v3 will be
148+
rejected.** Bootstrap v3 is now in maintenance mode and is therefore closed
149+
off to new features, so that we can focus our efforts on Bootstrap v4, the
150+
future of the framework. Pull requests that add new features should target
151+
[Bootstrap v4 (the `v4-dev` git branch)](https://github.com/twbs/bootstrap/tree/v4-dev)
152+
instead, where they will be welcomed and duly considered.
153+
136154
Please adhere to the [coding guidelines](#code-guidelines) used throughout the
137155
project (indentation, accurate comments, etc.) and any other requirements
138156
(such as test coverage).
139157

140158
**Do not edit `bootstrap.css`, `bootstrap-theme.css`, or `bootstrap.js`
141159
directly!** Those files are automatically generated. You should edit the
142-
source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less)
160+
source files in [`/bootstrap/less/`](https://github.com/twbs/bootstrap/tree/master/less),
161+
[`/bootstrap/scss/`](https://github.com/twbs/bootstrap/tree/v4-dev/scss) (for Bootstrap v4),
143162
and/or [`/bootstrap/js/`](https://github.com/twbs/bootstrap/tree/master/js) instead.
144163

145164
Similarly, when contributing to Bootstrap's documentation, you should edit the
@@ -179,7 +198,7 @@ included in the project:
179198

180199
4. Commit your changes in logical chunks. Please adhere to these [git commit
181200
message guidelines](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html)
182-
or your code is unlikely be merged into the main project. Use Git's
201+
or your code is unlikely to be merged into the main project. Use Git's
183202
[interactive rebase](https://help.github.com/articles/interactive-rebase)
184203
feature to tidy up your commits before making them public.
185204

@@ -229,14 +248,15 @@ includes code changes) and under the terms of the
229248
[Adhere to the Code Guide.](http://codeguide.co/#css)
230249

231250
- When feasible, default color palettes should comply with [WCAG color contrast guidelines](http://www.w3.org/TR/WCAG20/#visual-audio-contrast).
232-
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines/) for more details.
251+
- Except in rare cases, don't remove default `:focus` styles (via e.g. `outline: none;`) without providing alternative styles. See [this A11Y Project post](http://a11yproject.com/posts/never-remove-css-outlines) for more details.
233252

234253
### JS
235254

236255
- No semicolons (in client-side JS)
237256
- 2 spaces (no tabs)
238257
- strict mode
239258
- "Attractive"
259+
- Don't use [jQuery event alias convenience methods](https://github.com/jquery/jquery/blob/master/src/event/alias.js) (such as `$().focus()`). Instead, use [`$().trigger(eventType, ...)`](http://api.jquery.com/trigger/) or [`$().on(eventType, ...)`](http://api.jquery.com/on/), depending on whether you're firing an event or listening for an event. (For example, `$().trigger('focus')` or `$().on('focus', function (event) { /* handle focus event */ })`) We do this to be compatible with custom builds of jQuery where the event aliases module has been excluded.
240260

241261
### Checking coding style
242262

‎bootstrap/Gemfile‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
source 'https://rubygems.org'
2+
3+
group :development, :test do
4+
gem 'jekyll', '~> 3.1.2'
5+
gem 'jekyll-sitemap', '~> 0.11.0'
6+
end

‎bootstrap/Gemfile.lock‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
GEM
2+
remote: https://rubygems.org/
3+
specs:
4+
addressable (2.4.0)
5+
colorator (0.1)
6+
ffi (1.9.14-x64-mingw32)
7+
jekyll (3.1.6)
8+
colorator (~> 0.1)
9+
jekyll-sass-converter (~> 1.0)
10+
jekyll-watch (~> 1.1)
11+
kramdown (~> 1.3)
12+
liquid (~> 3.0)
13+
mercenary (~> 0.3.3)
14+
rouge (~> 1.7)
15+
safe_yaml (~> 1.0)
16+
jekyll-sass-converter (1.4.0)
17+
sass (~> 3.4)
18+
jekyll-sitemap (0.11.0)
19+
addressable (~> 2.4.0)
20+
jekyll-watch (1.4.0)
21+
listen (~> 3.0, < 3.1)
22+
kramdown (1.11.1)
23+
liquid (3.0.6)
24+
listen (3.0.8)
25+
rb-fsevent (~> 0.9, >= 0.9.4)
26+
rb-inotify (~> 0.9, >= 0.9.7)
27+
mercenary (0.3.6)
28+
rb-fsevent (0.9.7)
29+
rb-inotify (0.9.7)
30+
ffi (>= 0.5.0)
31+
rouge (1.11.1)
32+
safe_yaml (1.0.4)
33+
sass (3.4.22)
34+
35+
PLATFORMS
36+
x64-mingw32
37+
38+
DEPENDENCIES
39+
jekyll (~> 3.1.2)
40+
jekyll-sitemap (~> 0.11.0)
41+
42+
BUNDLED WITH
43+
1.12.5

‎bootstrap/Gruntfile.js‎

Lines changed: 31 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
* Bootstrap's Gruntfile
33
* http://getbootstrap.com
4-
* Copyright 2013-2015 Twitter, Inc.
4+
* Copyright 2013-2016 Twitter, Inc.
55
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
66
*/
77

@@ -17,7 +17,6 @@ module.exports = function (grunt) {
1717

1818
var fs = require('fs');
1919
var path = require('path');
20-
var npmShrinkwrap = require('npm-shrinkwrap');
2120
var generateGlyphiconsData = require('./grunt/bs-glyphicons-data-generator.js');
2221
var BsLessdocParser = require('./grunt/bs-lessdoc-parser.js');
2322
var getLessVarsData = function () {
@@ -130,7 +129,7 @@ module.exports = function (grunt) {
130129
warnings: false
131130
},
132131
mangle: true,
133-
preserveComments: 'some'
132+
preserveComments: /^!|@preserve|@license|@cc_on/i
134133
},
135134
core: {
136135
src: '<%= concat.bootstrap.dest %>',
@@ -232,6 +231,7 @@ module.exports = function (grunt) {
232231
compatibility: 'ie8',
233232
keepSpecialComments: '*',
234233
sourceMap: true,
234+
sourceMapInlineSources: true,
235235
advanced: false
236236
},
237237
minifyCore: {
@@ -277,7 +277,7 @@ module.exports = function (grunt) {
277277
copy: {
278278
fonts: {
279279
expand: true,
280-
src: 'fonts/*',
280+
src: 'fonts/**',
281281
dest: 'dist/'
282282
},
283283
docs: {
@@ -301,7 +301,9 @@ module.exports = function (grunt) {
301301

302302
jekyll: {
303303
options: {
304-
config: '_config.yml'
304+
bundleExec: true,
305+
config: '_config.yml',
306+
incremental: false
305307
},
306308
docs: {},
307309
github: {
@@ -314,12 +316,27 @@ module.exports = function (grunt) {
314316
htmlmin: {
315317
dist: {
316318
options: {
319+
collapseBooleanAttributes: true,
317320
collapseWhitespace: true,
318321
conservativeCollapse: true,
319-
minifyCSS: true,
322+
decodeEntities: false,
323+
minifyCSS: {
324+
compatibility: 'ie8',
325+
keepSpecialComments: 0
326+
},
320327
minifyJS: true,
328+
minifyURLs: false,
329+
processConditionalComments: true,
321330
removeAttributeQuotes: true,
322-
removeComments: true
331+
removeComments: true,
332+
removeOptionalAttributes: true,
333+
removeOptionalTags: true,
334+
removeRedundantAttributes: true,
335+
removeScriptTypeAttributes: true,
336+
removeStyleLinkTypeAttributes: true,
337+
removeTagWhitespace: false,
338+
sortAttributes: true,
339+
sortClassName: true
323340
},
324341
expand: true,
325342
cwd: '_gh_pages',
@@ -331,17 +348,17 @@ module.exports = function (grunt) {
331348
}
332349
},
333350

334-
jade: {
351+
pug: {
335352
options: {
336353
pretty: true,
337354
data: getLessVarsData
338355
},
339356
customizerVars: {
340-
src: 'docs/_jade/customizer-variables.jade',
357+
src: 'docs/_pug/customizer-variables.pug',
341358
dest: 'docs/_includes/customizer-variables.html'
342359
},
343360
customizerNav: {
344-
src: 'docs/_jade/customizer-nav.jade',
361+
src: 'docs/_pug/customizer-nav.pug',
345362
dest: 'docs/_includes/nav/customize.html'
346363
}
347364
},
@@ -350,7 +367,7 @@ module.exports = function (grunt) {
350367
options: {
351368
ignore: [
352369
'Attribute "autocomplete" not allowed on element "button" at this point.',
353-
'Attribute "autocomplete" is only allowed when the input type is "color", "date", "datetime", "datetime-local", "email", "month", "number", "password", "range", "search", "tel", "text", "time", "url", or "week".',
370+
'Attribute "autocomplete" is only allowed when the input type is "color", "date", "datetime", "datetime-local", "email", "hidden", "month", "number", "password", "range", "search", "tel", "text", "time", "url", or "week".',
354371
'Element "img" is missing required attribute "src".'
355372
]
356373
},
@@ -372,25 +389,6 @@ module.exports = function (grunt) {
372389
}
373390
},
374391

375-
sed: {
376-
versionNumber: {
377-
pattern: (function () {
378-
var old = grunt.option('oldver');
379-
return old ? RegExp.quote(old) : old;
380-
})(),
381-
replacement: grunt.option('newver'),
382-
exclude: [
383-
'dist/fonts',
384-
'docs/assets',
385-
'fonts',
386-
'js/tests/vendor',
387-
'node_modules',
388-
'test-infra'
389-
],
390-
recursive: true
391-
}
392-
},
393-
394392
'saucelabs-qunit': {
395393
all: {
396394
options: {
@@ -485,16 +483,11 @@ module.exports = function (grunt) {
485483
// Default task.
486484
grunt.registerTask('default', ['clean:dist', 'copy:fonts', 'test']);
487485

488-
// Version numbering task.
489-
// grunt change-version-number --oldver=A.B.C --newver=X.Y.Z
490-
// This can be overzealous, so its changes should always be manually reviewed!
491-
grunt.registerTask('change-version-number', 'sed');
492-
493486
grunt.registerTask('build-glyphicons-data', function () { generateGlyphiconsData.call(this, grunt); });
494487

495488
// task for building customizer
496489
grunt.registerTask('build-customizer', ['build-customizer-html', 'build-raw-files']);
497-
grunt.registerTask('build-customizer-html', 'jade');
490+
grunt.registerTask('build-customizer-html', 'pug');
498491
grunt.registerTask('build-raw-files', 'Add scripts/less files to customizer.', function () {
499492
var banner = grunt.template.process('<%= banner %>');
500493
generateRawFiles(grunt, banner);
@@ -512,22 +505,7 @@ module.exports = function (grunt) {
512505
grunt.registerTask('docs-js', ['uglify:docsJs', 'uglify:customize']);
513506
grunt.registerTask('lint-docs-js', ['jshint:assets', 'jscs:assets']);
514507
grunt.registerTask('docs', ['docs-css', 'lint-docs-css', 'docs-js', 'lint-docs-js', 'clean:docs', 'copy:docs', 'build-glyphicons-data', 'build-customizer']);
508+
grunt.registerTask('docs-github', ['jekyll:github', 'htmlmin']);
515509

516-
grunt.registerTask('prep-release', ['dist', 'docs', 'jekyll:github', 'htmlmin', 'compress']);
517-
518-
// Task for updating the cached npm packages used by the Travis build (which are controlled by test-infra/npm-shrinkwrap.json).
519-
// This task should be run and the updated file should be committed whenever Bootstrap's dependencies change.
520-
grunt.registerTask('update-shrinkwrap', ['exec:npmUpdate', '_update-shrinkwrap']);
521-
grunt.registerTask('_update-shrinkwrap', function () {
522-
var done = this.async();
523-
npmShrinkwrap({ dev: true, dirname: __dirname }, function (err) {
524-
if (err) {
525-
grunt.fail.warn(err);
526-
}
527-
var dest = 'test-infra/npm-shrinkwrap.json';
528-
fs.renameSync('npm-shrinkwrap.json', dest);
529-
grunt.log.writeln('File ' + dest.cyan + ' updated.');
530-
done();
531-
});
532-
});
510+
grunt.registerTask('prep-release', ['dist', 'docs', 'docs-github', 'compress']);
533511
};

‎bootstrap/ISSUE_TEMPLATE.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Before opening an issue:
2+
3+
- [Search for duplicate or closed issues](https://github.com/twbs/bootstrap/issues?utf8=%E2%9C%93&q=is%3Aissue)
4+
- [Validate](http://validator.w3.org/nu/) and [lint](https://github.com/twbs/bootlint#in-the-browser) any HTML to avoid common problems
5+
- Prepare a [reduced test case](https://css-tricks.com/reduced-test-cases/) for any bugs
6+
- Read the [contributing guidelines](https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md)
7+
8+
When asking general "how to" questions:
9+
10+
- Please do not open an issue here
11+
- Instead, ask for help on [StackOverflow, IRC, or Slack](https://github.com/twbs/bootstrap/blob/master/README.md#community)
12+
13+
When reporting a bug, include:
14+
15+
- Operating system and version (Windows, Mac OS X, Android, iOS, Win10 Mobile)
16+
- Browser and version (Chrome, Firefox, Safari, IE, MS Edge, Opera 15+, Android Browser)
17+
- Reduced test cases and potential fixes using [JS Bin](https://jsbin.com)
18+
19+
When suggesting a feature, include:
20+
21+
- As much detail as possible for what we should add and why it's important to Bootstrap
22+
- Relevant links to prior art, screenshots, or live demos whenever possible

‎bootstrap/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2011-2015 Twitter, Inc
3+
Copyright (c) 2011-2016 Twitter, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)