kotovalexarian-likes-github
/
twbs--bootstrap
mirror of https://github.com/twbs/bootstrap.git
1
0
Fork 0
Code Releases Activity

Update dependencies, including Babel to v6 and zeroUnits fix.

This commit is contained in:
Bardi Harborow 2016-10-07 00:21:05 +11:00
parent e56146e592
commit d57d5a606b
19 changed files with 4129 additions and 2913 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile
View File

@ -1,8 +1,8 @@
source 'https://rubygems.org'
group :development, :test do
gem 'jekyll', '~> 3.1.2'
gem 'jekyll', '~> 3.3.0'
gem 'jekyll-redirect-from', '~> 0.11.0'
gem 'jekyll-sitemap', '~> 0.11.0'
gem 'scss_lint', '~> 0.49.0'
gem 'scss_lint', '~> 0.50.2'
end

29
Gemfile.lock
View File

@ -2,16 +2,18 @@ GEM
remote: https://rubygems.org/
specs:
addressable (2.4.0)
colorator (0.1)
ffi (1.9.13)
ffi (1.9.13-x64-mingw32)
jekyll (3.1.6)
colorator (~> 0.1)
colorator (1.1.0)
ffi (1.9.14)
forwardable-extended (2.6.0)
jekyll (3.3.0)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 3.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
jekyll-redirect-from (0.11.0)
@ -20,34 +22,35 @@ GEM
sass (~> 3.4)
jekyll-sitemap (0.11.0)
addressable (~> 2.4.0)
jekyll-watch (1.4.0)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
kramdown (1.11.1)
kramdown (1.12.0)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
mercenary (0.3.6)
rake (11.2.2)
pathutil (0.14.0)
forwardable-extended (~> 2.6)
rake (11.3.0)
rb-fsevent (0.9.7)
rb-inotify (0.9.7)
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.22)
scss_lint (0.49.0)
scss_lint (0.50.2)
rake (>= 0.9, < 12)
sass (~> 3.4.20)
PLATFORMS
ruby
x64-mingw32
DEPENDENCIES
jekyll (~> 3.1.2)
jekyll (~> 3.3.0)
jekyll-redirect-from (~> 0.11.0)
jekyll-sitemap (~> 0.11.0)
scss_lint (~> 0.49.0)
scss_lint (~> 0.50.2)
BUNDLED WITH
1.12.5
1.13.2

17
Gruntfile.js
View File

@ -58,8 +58,7 @@ module.exports = function (grunt) {
babel: {
dev: {
options: {
sourceMap: true,
modules: 'ignore'
sourceMap: true
},
files: {
'js/dist/util.js' : 'js/src/util.js',
@ -77,7 +76,7 @@ module.exports = function (grunt) {
},
dist: {
options: {
modules: 'ignore'
extends: '../../js/.babelrc'
},
files: {
'<%= concat.bootstrap.dest %>' : '<%= concat.bootstrap.dest %>'
@ -87,8 +86,8 @@ module.exports = function (grunt) {
stamp: {
options: {
banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= jqueryVersionCheck %>\n+function ($) {\n',
footer: '\n}(jQuery);'
banner: '<%= banner %>\n<%= jqueryCheck %>\n<%= jqueryVersionCheck %>\n+function () {\n',
footer: '\n}();'
},
bootstrap: {
files: {
@ -102,8 +101,7 @@ module.exports = function (grunt) {
// Custom function to remove all export and import statements
process: function (src) {
return src.replace(/^(export|import).*/gm, '');
},
stripBanners: false
}
},
bootstrap: {
src: [
@ -165,10 +163,7 @@ module.exports = function (grunt) {
cssmin: {
options: {
// TODO: disable `zeroUnits` optimization once clean-css 3.2 is released
// and then simplify the fix for https://github.com/twbs/bootstrap/issues/14837 accordingly
compatibility: 'ie9',
keepSpecialComments: '*',
compatibility: 'ie9,-properties.zeroUnits',
sourceMap: true,
// sourceMapInlineSources: true,
advanced: false

8
_config.yml
View File

@ -49,7 +49,7 @@ cdn:
css_hash: "sha384-2hfp1SzUoho7/TsGGGDaFdsuuDL0LX2hnUp6VkX3CUQ2K4K+xjboZdsXyp4oUHZj"
js: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/js/bootstrap.min.js
js_hash: "sha384-VjEeINv9OSwtWFLAtmc4JCtEJXXBub00gtSnszmspDLCtC0I4z4nqz7rEFbIZLLU"
jquery: https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js
jquery_hash: "sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY"
tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js
tether_hash: "sha384-Plbmg8JY28KFelvJVai01l8WyZzrYWG825m+cZ0eDDS1f7d/js6ikvy1+X+guPIB"
jquery: https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js
jquery_hash: "sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7"
tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.3.7/js/tether.min.js
tether_hash: "sha384-XTs3FgkjiBgo8qjEjBk0tGmf3wPrWtA6coPfQDfFEY8AnYJwjalXCiosYRBIBZX8"

2
bower.json
View File

@ -30,6 +30,6 @@
],
"dependencies": {
"jquery": "1.9.1 - 3",
"tether": "^1.1.1"
"tether": "^1.3.7"
}
}

4
docs/assets/js/vendor/anchor.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
docs/assets/js/vendor/clipboard.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
docs/assets/js/vendor/holder.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/vendor/jekyll-search.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
docs/assets/js/vendor/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
docs/assets/js/vendor/tether.min.js vendored
View File

File diff suppressed because one or more lines are too long

3561
grunt/npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

14
js/.babelrc Normal file
View File

@ -0,0 +1,14 @@
{
"presets": [
[
"es2015",
{
"modules": false,
"loose": true
}
]
],
"plugins": [
"transform-es2015-modules-strip"
]
}

8
js/tests/vendor/jquery.min.js vendored
View File

File diff suppressed because one or more lines are too long

180
js/tests/vendor/qunit.css vendored
View File

@ -1,12 +1,12 @@
/*!
* QUnit 1.20.0
* http://qunitjs.com/
* QUnit 2.0.1
* https://qunitjs.com/
*
* Copyright jQuery Foundation and other contributors
* Released under the MIT license
* http://jquery.org/license
* https://jquery.org/license
*
* Date: 2015-10-27T17:53Z
* Date: 2016-07-23T19:39Z
*/
/** Font Family and Sizes */
@ -27,7 +27,7 @@
}
/** Header */
/** Header (excluding toolbar) */
#qunit-header {
padding: 0.5em 0 0.5em 1em;
@ -52,51 +52,161 @@
color: #FFF;
}
#qunit-testrunner-toolbar label {
display: inline-block;
padding: 0 0.5em 0 0.1em;
}
#qunit-banner {
height: 5px;
}
#qunit-filteredTest {
padding: 0.5em 1em 0.5em 1em;
color: #366097;
background-color: #F4FF77;
}
#qunit-userAgent {
padding: 0.5em 1em 0.5em 1em;
color: #FFF;
background-color: #2B81AF;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
}
/** Toolbar */
#qunit-testrunner-toolbar {
padding: 0.5em 1em 0.5em 1em;
color: #5E740B;
background-color: #EEE;
overflow: hidden;
}
#qunit-filteredTest {
padding: 0.5em 1em 0.5em 1em;
background-color: #F4FF77;
color: #366097;
#qunit-testrunner-toolbar .clearfix {
height: 0;
clear: both;
}
#qunit-userAgent {
padding: 0.5em 1em 0.5em 1em;
background-color: #2B81AF;
color: #FFF;
text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
}
#qunit-modulefilter-container {
float: right;
padding: 0.2em;
}
.qunit-url-config {
#qunit-testrunner-toolbar label {
display: inline-block;
padding: 0.1em;
}
.qunit-filter {
display: block;
#qunit-testrunner-toolbar input[type=checkbox],
#qunit-testrunner-toolbar input[type=radio] {
margin: 3px;
vertical-align: -2px;
}
#qunit-testrunner-toolbar input[type=text] {
box-sizing: border-box;
height: 1.6em;
}
.qunit-url-config,
.qunit-filter,
#qunit-modulefilter {
display: inline-block;
line-height: 2.1em;
}
.qunit-filter,
#qunit-modulefilter {
float: right;
position: relative;
margin-left: 1em;
}
.qunit-url-config label {
margin-right: 0.5em;
}
#qunit-modulefilter-search {
box-sizing: border-box;
width: 400px;
}
#qunit-modulefilter-search-container:after {
position: absolute;
right: 0.3em;
content: "\25bc";
color: black;
}
#qunit-modulefilter-dropdown {
/* align with #qunit-modulefilter-search */
box-sizing: border-box;
width: 400px;
position: absolute;
right: 0;
top: 50%;
margin-top: 0.8em;
border: 1px solid #D3D3D3;
border-top: none;
border-radius: 0 0 .25em .25em;
color: #000;
background-color: #F5F5F5;
z-index: 99;
}
#qunit-modulefilter-dropdown a {
color: inherit;
text-decoration: none;
}
#qunit-modulefilter-dropdown .clickable.checked {
font-weight: bold;
color: #000;
background-color: #D2E0E6;
}
#qunit-modulefilter-dropdown .clickable:hover {
color: #FFF;
background-color: #0D3349;
}
#qunit-modulefilter-actions {
display: block;
overflow: auto;
/* align with #qunit-modulefilter-dropdown-list */
font: smaller/1.5em sans-serif;
}
#qunit-modulefilter-dropdown #qunit-modulefilter-actions > * {
box-sizing: border-box;
max-height: 2.8em;
display: block;
padding: 0.4em;
}
#qunit-modulefilter-dropdown #qunit-modulefilter-actions > button {
float: right;
font: inherit;
}
#qunit-modulefilter-dropdown #qunit-modulefilter-actions > :last-child {
/* insert padding to align with checkbox margins */
padding-left: 3px;
}
#qunit-modulefilter-dropdown-list {
max-height: 200px;
overflow-y: auto;
margin: 0;
border-top: 2px groove threedhighlight;
padding: 0.4em 0 0;
font: smaller/1.5em sans-serif;
}
#qunit-modulefilter-dropdown-list li {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
#qunit-modulefilter-dropdown-list .clickable {
display: block;
padding-left: 0.15em;
}
/** Tests: Pass/Fail */
#qunit-tests {
@ -120,6 +230,10 @@
display: list-item;
}
#qunit-tests.hidepass {
position: relative;
}
#qunit-tests.hidepass li.running,
#qunit-tests.hidepass li.pass {
visibility: hidden;
@ -198,14 +312,14 @@
}
#qunit-tests del {
background-color: #E0F2BE;
color: #374E0C;
background-color: #E0F2BE;
text-decoration: none;
}
#qunit-tests ins {
background-color: #FFCACA;
color: #500;
background-color: #FFCACA;
text-decoration: none;
}

3139
js/tests/vendor/qunit.js vendored
View File

File diff suppressed because it is too large Load Diff

2
js/tests/vendor/tether.min.js vendored
View File

File diff suppressed because one or more lines are too long

50
package.json
View File

@ -39,41 +39,43 @@
"license": "MIT",
"dependencies": {
"jquery": "1.9.1 - 3",
"tether": "^1.1.1"
"tether": "^1.3.7"
},
"devDependencies": {
"autoprefixer": "^6.0.3",
"babel-eslint": "^6.0.4",
"eslint": "^3.0.0",
"autoprefixer": "^6.5.0",
"babel-eslint": "^7.0.0",
"babel-plugin-transform-es2015-modules-strip": "^0.1.0",
"babel-preset-es2015": "^6.16.0",
"eslint": "^3.7.1",
"grunt": "^1.0.1",
"grunt-babel": "^5.0.3",
"grunt-build-control": "^0.7.0",
"grunt-babel": "^6.0.0",
"grunt-build-control": "^0.7.1",
"grunt-contrib-clean": "^1.0.0",
"grunt-contrib-compress": "^1.1.0",
"grunt-contrib-concat": "^1.0.0",
"grunt-contrib-connect": "^1.0.0",
"grunt-contrib-compress": "^1.3.0",
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-cssmin": "^1.0.0",
"grunt-contrib-qunit": "^1.0.1",
"grunt-contrib-cssmin": "^1.0.2",
"grunt-contrib-qunit": "^1.2.0",
"grunt-contrib-sass": "^1.0.0",
"grunt-contrib-uglify": "^1.0.0",
"grunt-contrib-uglify": "^2.0.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-exec": "^1.0.0",
"grunt-html": "^8.0.1",
"grunt-jekyll": "^0.4.2",
"grunt-sass": "^1.0.0",
"grunt-exec": "^1.0.1",
"grunt-html": "^8.0.2",
"grunt-jekyll": "^0.4.4",
"grunt-sass": "^1.2.1",
"grunt-saucelabs": "^9.0.0",
"grunt-scss-lint": "^0.3.8",
"grunt-scss-lint": "^0.5.0",
"grunt-stamp": "^0.3.0",
"htmlhint": "^0.9.13",
"is-travis": "^1.0.0",
"jscs": "^3.0.4",
"load-grunt-tasks": "^3.4.0",
"postcss-cli": "^2.5.2",
"jscs": "^3.0.7",
"load-grunt-tasks": "^3.5.2",
"postcss-cli": "^2.6.0",
"postcss-flexbugs-fixes": "^2.0.0",
"shelljs": "^0.7.0",
"shx": "^0.1.2",
"time-grunt": "^1.2.1"
"shelljs": "^0.7.4",
"shx": "^0.1.4",
"time-grunt": "^1.4.0"
},
"engines": {
"node": ">=4"
@ -100,7 +102,7 @@
}
},
"dependencies": {
"jquery": "1.9.1 - 3"
"jquery": "3"
}
}
}

2
scss/_tables.scss
View File

@ -143,7 +143,7 @@
.table-responsive {
display: block;
width: 100%;
min-height: .01%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
min-height: 0%; // Workaround for IE9 bug (see https://github.com/twbs/bootstrap/issues/14837)
overflow-x: auto;
// TODO: find out if we need this still.