mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-05-27 14:46:01 +03:00
Code Activity

Merge branch 'v4-dev' of https://github.com/twbs/bootstrap into v4-dev

Browse Source
This commit is contained in:
Mark Otto
2017-03-12 17:56:09 -07:00
parent 7e07d5bf2e 84ce248f06
commit 7180b42aa1
12 changed files with 439 additions and 377 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.hound.yml
+1 -3
View File
@@ -1,14 +1,12 @@
fail_on_violations: true
scss:
enabled: true
config_file: scss/.scss-lint.yml
javascript:
jshint:
enabled: false
eslint:
enabled: true
config_file: js/.eslintrc.json
ignore_file: .houndignore
.travis.yml
+2 -2
View File
@@ -5,9 +5,9 @@ git:
depth: 3
node_js:
- "4"
- "6"
- "7"
before_install:
- if [[ `npm -v` != 3* ]]; then npm install -g npm@3; fi
- if [[ `npm -v` != 4* ]]; then npm install -g npm@4; fi
- "export TRAVIS_COMMIT_MSG=\"`git log --format=%B --no-merges -n 1`\""
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip validator\]'; export TWBS_DO_VALIDATOR=$?; true
- echo "$TRAVIS_COMMIT_MSG" | grep '\[skip sauce\]'; export TWBS_DO_SAUCE=$?; true
Gemfile
+1 -1
View File
@@ -1,7 +1,7 @@
source 'https://rubygems.org'
group :development, :test do
gem 'jekyll', '~> 3.4.0'
gem 'jekyll', '~> 3.4.2'
gem 'jekyll-redirect-from', '~> 0.12.1'
gem 'jekyll-sitemap', '~> 1.0.0'
gem 'scss_lint', '~> 0.52.0'
Gemfile.lock
+4 -4
View File
@@ -4,9 +4,9 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.17)
ffi (1.9.18)
forwardable-extended (2.6.0)
jekyll (3.4.0)
jekyll (3.4.2)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
@@ -49,10 +49,10 @@ PLATFORMS
ruby
DEPENDENCIES
jekyll (~> 3.4.0)
jekyll (~> 3.4.2)
jekyll-redirect-from (~> 0.12.1)
jekyll-sitemap (~> 1.0.0)
scss_lint (~> 0.52.0)
BUNDLED WITH
1.13.6
1.14.6
docs/.htmlhintrc
+3 -1
View File
@@ -1,12 +1,14 @@
{
"alt-require": true,
"attr-lowercase": true,
"attr-no-duplication": true,
"alt-require": true,
"attr-unsafe-chars": true,
"attr-value-double-quotes": true,
"doctype-first": true,
"doctype-html5": true,
"id-class-value": true,
"id-unique": true,
"space-tab-mixed-disabled": true,
"spec-char-escape": true,
"src-not-empty": true,
"tag-pair": true,
docs/assets/js/vendor/clipboard.min.js
Vendored
+2 -2
View File
File diff suppressed because one or more lines are too long
docs/assets/js/vendor/jekyll-search.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
grunt/npm-shrinkwrap.json
Generated
+359 -306
View File
File diff suppressed because it is too large Load Diff
grunt/postcss.config.js
+41
View File
@@ -0,0 +1,41 @@
module.exports = (ctx) => ({
map: ctx.file.dirname.startsWith('docs') ? false : {
inline: false,
annotation: true,
sourcesContent: true
},
plugins: {
autoprefixer: {
browsers: [
//
// Official browser support policy:
// https://v4-alpha.getbootstrap.com/getting-started/browsers-devices/#supported-browsers
//
'Chrome >= 35', // Exact version number here is kinda arbitrary
// Rather than using Autoprefixer's native "Firefox ESR" version specifier string,
// we deliberately hardcode the number. This is to avoid unwittingly severely breaking the previous ESR in the event that:
// (a) we happen to ship a new Bootstrap release soon after the release of a new ESR,
// such that folks haven't yet had a reasonable amount of time to upgrade; and
// (b) the new ESR has unprefixed CSS properties/values whose absence would severely break webpages
// (e.g. `box-sizing`, as opposed to `background: linear-gradient(...)`).
// Since they've been unprefixed, Autoprefixer will stop prefixing them,
// thus causing them to not work in the previous ESR (where the prefixes were required).
'Firefox >= 38', // Current Firefox Extended Support Release (ESR); https://www.mozilla.org/en-US/firefox/organizations/faq/
// Note: Edge versions in Autoprefixer & Can I Use refer to the EdgeHTML rendering engine version,
// NOT the Edge app version shown in Edge's "About" screen.
// For example, at the time of writing, Edge 20 on an up-to-date system uses EdgeHTML 12.
// See also https://github.com/Fyrd/caniuse/issues/1928
'Edge >= 12',
'Explorer >= 10',
// Out of leniency, we prefix these 1 version further back than the official policy.
'iOS >= 8',
'Safari >= 8',
// The following remain NOT officially supported, but we're lenient and include their prefixes to avoid severely breaking in them.
'Android 2.3',
'Android >= 4',
'Opera >= 12'
]
},
'postcss-flexbugs-fixes': {}
}
})
grunt/postcss.js
-42
View File
@@ -1,42 +0,0 @@
module.exports = {
use: [
'postcss-flexbugs-fixes',
'autoprefixer'
],
map: {
inline: false,
annotation: true,
sourcesContent: true
},
autoprefixer: {
browsers: [
//
// Official browser support policy:
// https://v4-alpha.getbootstrap.com/getting-started/browsers-devices/#supported-browsers
//
'Chrome >= 35', // Exact version number here is kinda arbitrary
// Rather than using Autoprefixer's native "Firefox ESR" version specifier string,
// we deliberately hardcode the number. This is to avoid unwittingly severely breaking the previous ESR in the event that:
// (a) we happen to ship a new Bootstrap release soon after the release of a new ESR,
// such that folks haven't yet had a reasonable amount of time to upgrade; and
// (b) the new ESR has unprefixed CSS properties/values whose absence would severely break webpages
// (e.g. `box-sizing`, as opposed to `background: linear-gradient(...)`).
// Since they've been unprefixed, Autoprefixer will stop prefixing them,
// thus causing them to not work in the previous ESR (where the prefixes were required).
'Firefox >= 38', // Current Firefox Extended Support Release (ESR); https://www.mozilla.org/en-US/firefox/organizations/faq/
// Note: Edge versions in Autoprefixer & Can I Use refer to the EdgeHTML rendering engine version,
// NOT the Edge app version shown in Edge's "About" screen.
// For example, at the time of writing, Edge 20 on an up-to-date system uses EdgeHTML 12.
// See also https://github.com/Fyrd/caniuse/issues/1928
'Edge >= 12',
'Explorer >= 10',
// Out of leniency, we prefix these 1 version further back than the official policy.
'iOS >= 8',
'Safari >= 8',
// The following remain NOT officially supported, but we're lenient and include their prefixes to avoid severely breaking in them.
'Android 2.3',
'Android >= 4',
'Opera >= 12'
]
}
}
js/.eslintrc.json
+15 -5
View File
@@ -13,6 +13,8 @@
},
"rules": {
// Possible Errors
"no-await-in-loop": "error",
"no-compare-neg-zero": "error",
"no-extra-parens": "error",
"no-prototype-builtins": "off",
"no-template-curly-in-string": "error",
@@ -67,6 +69,7 @@
}
],
"no-multi-str": "error",
"no-new": "error",
"no-new-func": "off",
"no-new-wrappers": "error",
"no-new": "error",
@@ -75,6 +78,7 @@
"no-proto": "error",
"no-restricted-properties": "error",
"no-return-assign": "off",
"no-return-await": "error",
"no-script-url": "error",
"no-self-compare": "error",
"no-sequences": "error",
@@ -84,9 +88,11 @@
"no-useless-call": "error",
"no-useless-concat": "error",
"no-useless-escape": "error",
"no-useless-return": "off",
"no-void": "error",
"no-warning-comments": "off",
"no-with": "error",
"prefer-promise-reject-errors": "error",
"radix": "error",
"vars-on-top": "error",
"wrap-iife": "error",
@@ -100,8 +106,8 @@
"no-catch-shadow": "error",
"no-label-var": "error",
"no-restricted-globals": "error",
"no-shadow-restricted-names": "error",
"no-shadow": "off",
"no-shadow-restricted-names": "error",
"no-undef-init": "error",
"no-undefined": "off",
"no-use-before-define": "off",
@@ -122,6 +128,7 @@
"array-bracket-spacing": "error",
"block-spacing": "error",
"brace-style": "error",
"capitalized-comments": "off",
"camelcase": "error",
"comma-dangle": "error",
"comma-spacing": "error",
@@ -130,6 +137,7 @@
"consistent-this": "error",
"eol-last": "error",
"func-call-spacing": "error",
"func-name-matching": "error",
"func-names": "off",
"func-style": ["error", "declaration"],
"id-blacklist": "error",
@@ -148,8 +156,8 @@
"max-lines": "off",
"max-nested-callbacks": "error",
"max-params": "off",
"max-statements-per-line": "error",
"max-statements": "off",
"max-statements-per-line": "error",
"multiline-ternary": "off",
"new-cap": ["error", { "capIsNewExceptionPattern": "$.*" }],
"new-parens": "error",
@@ -162,6 +170,7 @@
"no-inline-comments": "off",
"no-lonely-if": "error",
"no-mixed-operators": "off",
"no-multi-assign": "error",
"no-multiple-empty-lines": "error",
"no-negated-condition": "off",
"no-nested-ternary": "error",
@@ -174,19 +183,20 @@
"no-underscore-dangle": "off",
"no-unneeded-ternary": "error",
"no-whitespace-before-property": "error",
"nonblock-statement-body-position": "error",
"object-curly-newline": ["error", { "minProperties": 1 }],
"object-curly-spacing": ["error", "always"],
"object-property-newline": "error",
"one-var-declaration-per-line": "error",
"one-var": ["error", "never"],
"one-var-declaration-per-line": "error",
"operator-assignment": "error",
"operator-linebreak": "off",
"padded-blocks": "off",
"quote-props": ["error", "as-needed"],
"quotes": ["error", "single"],
"require-jsdoc": "off",
"semi-spacing": "error",
"semi": ["error", "never"],
"semi-spacing": "error",
"sort-keys": "off",
"sort-vars": "error",
"space-before-blocks": "error",
@@ -198,6 +208,7 @@
"space-infix-ops": "error",
"space-unary-ops": "error",
"spaced-comment": "error",
"template-tag-spacing": "error",
"unicode-bom": "error",
"wrap-regex": "off",
@@ -217,7 +228,6 @@
"prefer-arrow-callback": "error",
"prefer-const": "error",
"prefer-numeric-literals": "error",
"prefer-reflect": "off",
"prefer-rest-params": "error",
"prefer-spread": "error",
"prefer-template": "error",
package.json
+10 -10
View File
@@ -25,8 +25,8 @@
"htmllint": "htmllint --rc docs/.htmllintrc _gh_pages/**/*.html js/tests/visual/*.html",
"jekyll": "bundle exec jekyll build",
"jekyll-github": "shx echo 'github: true' > $npm_config_tmp/twbsjekyll.yml && npm run jekyll -- --config _config.yml,$npm_config_tmp/twbsjekyll.yml && shx rm $npm_config_tmp/twbsjekyll.yml",
"postcss": "postcss --config grunt/postcss.js --replace dist/css/*.css",
"postcss-docs": "postcss --config grunt/postcss.js --no-map --replace docs/assets/css/docs.min.css && postcss --config grunt/postcss.js --no-map --replace docs/examples/**/*.css",
"postcss": "postcss --config grunt/ --replace dist/css/*.css",
"postcss-docs": "postcss --config grunt/ --replace docs/assets/css/docs.min.css && postcss --config grunt/ --replace docs/examples/**/*.css",
"sass": "node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css",
"sass-docs": "node-sass --output-style expanded --source-map true --precision 6 docs/assets/scss/docs.scss docs/assets/css/docs.min.css",
"scss-lint": "bundle exec scss-lint --config scss/.scss-lint.yml scss/*.scss",
@@ -52,12 +52,12 @@
"tether": "^1.4.0"
},
"devDependencies": {
"autoprefixer": "^6.7.2",
"autoprefixer": "^6.7.7",
"babel-eslint": "^7.1.1",
"babel-plugin-transform-es2015-modules-strip": "^0.1.0",
"babel-preset-es2015": "^6.22.0",
"clean-css-cli": "^4.0.0",
"eslint": "^3.15.0",
"clean-css-cli": "^4.0.8",
"eslint": "^3.17.1",
"grunt": "^1.0.1",
"grunt-babel": "^6.0.0",
"grunt-build-control": "^0.7.1",
@@ -66,9 +66,9 @@
"grunt-contrib-concat": "^1.0.1",
"grunt-contrib-connect": "^1.0.2",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-qunit": "^1.2.0",
"grunt-contrib-qunit": "^1.3.0",
"grunt-contrib-watch": "^1.0.0",
"grunt-exec": "^1.0.1",
"grunt-exec": "^2.0.0",
"grunt-saucelabs": "^9.0.0",
"grunt-stamp": "^0.3.0",
"htmlhint": "^0.9.13",
@@ -76,12 +76,12 @@
"is-travis": "^1.0.0",
"load-grunt-tasks": "^3.5.2",
"node-sass": "^4.5.0",
"postcss-cli": "^2.6.0",
"postcss-cli": "^3.0.0-beta",
"postcss-flexbugs-fixes": "^2.1.0",
"shelljs": "^0.7.6",
"shelljs": "^0.7.7",
"shx": "^0.2.2",
"time-grunt": "^1.4.0",
"uglify-js": "^2.7.5"
"uglify-js": "^2.8.12"
},
"engines": {
"node": ">=4"