diff --git a/package.json b/package.json index 9af3b111dc96..5676cd6733da 100644 --- a/package.json +++ b/package.json @@ -18,21 +18,21 @@ ], "scripts": { "start": "npm-run-all --parallel watch docs-serve", - "blc": "blc --exclude-external --filter-level 3 --get --ordered --recursive --host-requests 4 --input http://localhost:3000/", + "blc": "blc --filter-level 3 --get --ordered --recursive --host-requests 4 --input http://localhost:3000/", "http-server": "http-server --silent -p 3000", "bundlesize": "bundlesize", "check-broken-links": "npm-run-all --parallel --race \"http-server -- _gh_pages/\" blc", "css": "npm-run-all --parallel css-lint* css-compile* --sequential css-prefix* css-minify*", "css-main": "npm-run-all --parallel css-lint css-compile --sequential css-prefix css-minify css-copy", "css-docs": "npm-run-all --parallel css-lint-docs css-compile-docs --sequential css-prefix-docs css-minify-docs", - "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css", + "css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap.scss dist/css/bootstrap.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-grid.scss dist/css/bootstrap-grid.css && node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/bootstrap-reboot.scss dist/css/bootstrap-reboot.css && npm run css-copy", "css-compile-docs": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 site/docs/4.1/assets/scss/docs.scss site/docs/4.1/assets/css/docs.min.css", "css-copy": "shx mkdir -p site/docs/4.1/dist/ && shx cp -r dist/css/ site/docs/4.1/dist/", "css-lint": "stylelint --syntax scss \"scss/**/*.scss\"", "css-lint-docs": "stylelint --syntax scss \"site/docs/4.1/assets/scss/*.scss\" && stylelint \"site/docs/**/*.css\"", - "css-lint-vars": "node build/lint-vars.js scss/ site/docs/4.1/assets/scss/", + "css-lint-vars": "node build/lint-vars.js scss/ site/docs/", "css-prefix": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.min.css\"", - "css-prefix-docs": "postcss --config build/postcss.config.js --replace \"site/docs/4.1/assets/css/docs.min.css\" \"site/docs/**/*.css\"", + "css-prefix-docs": "postcss --config build/postcss.config.js --replace \"site/docs/**/*.css\" \"site/docs/**/*.css\"", "css-minify": "cleancss --level 1 --format breaksWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap.min.css dist/css/bootstrap.css && cleancss --level 1 --format breaksWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-grid.min.css dist/css/bootstrap-grid.css && cleancss --level 1 --format breaksWith=lf --source-map --source-map-inline-sources --output dist/css/bootstrap-reboot.min.css dist/css/bootstrap-reboot.css", "css-minify-docs": "cleancss --level 1 --format breaksWith=lf --source-map --source-map-inline-sources --output site/docs/4.1/assets/css/docs.min.css site/docs/4.1/assets/css/docs.min.css", "js": "npm-run-all js-lint* js-compile js-minify js-copy", @@ -72,7 +72,7 @@ "release-version": "node build/change-version.js", "release-zip": "cd dist/ && zip -r9 bootstrap-$npm_package_version-dist.zip * && shx mv bootstrap-$npm_package_version-dist.zip ..", "saucelabs-test": "node build/saucelabs-unit-test.js", - "dist": "npm-run-all --parallel css-main js", + "dist": "npm-run-all --parallel css js", "test": "npm-run-all dist js-test docs-compile docs-lint bundlesize", "watch": "npm-run-all --parallel watch-*", "watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm run css-main\"", diff --git a/site/_data/translations.yml b/site/_data/translations.yml index 38b5771c480e..65bf6b53a319 100644 --- a/site/_data/translations.yml +++ b/site/_data/translations.yml @@ -8,11 +8,6 @@ description: Bootstrap 4 · 全球最流行的 HTML、CSS 和 JS 工具库。 url: https://code.z01.com/v4 -- name: Chinese - code: zh - description: Bootstrap 4 中文文档教程 - url: https://wiki.jikexueyuan.com/project/bootstrap4/ - - name: Brazilian Portuguese code: pt-BR description: Bootstrap 4 Português do Brasil diff --git a/site/docs/4.1/components/forms.md b/site/docs/4.1/components/forms.md index f0db3f7195b4..9d095cae4021 100644 --- a/site/docs/4.1/components/forms.md +++ b/site/docs/4.1/components/forms.md @@ -1111,7 +1111,7 @@ We use the sibling selector (`~`) for all our `` states—like `:checked` We hide the default `` with `opacity` and use the `.custom-control-label` to build a new custom form indicator in its place with `::before` and `::after`. Unfortunately we can't build a custom one from just the `` because CSS's `content` doesn't work on that element. -In the checked states, we use **base64 embedded SVG icons** from [Open Iconic](https://useiconic.com/open). This provides us the best control for styling and positioning across browsers and devices. +In the checked states, we use **base64 embedded SVG icons** from [Open Iconic](https://github.com/iconic/open-iconic). This provides us the best control for styling and positioning across browsers and devices. #### Checkboxes diff --git a/site/docs/4.1/examples/.eslintrc.json b/site/docs/4.1/examples/.eslintrc.json index f04fd6ae131d..7461ae627b34 100644 --- a/site/docs/4.1/examples/.eslintrc.json +++ b/site/docs/4.1/examples/.eslintrc.json @@ -7,5 +7,5 @@ "ecmaVersion": 5, "sourceType": "script" }, - "extends": "../../../js/tests/unit/.eslintrc.json" + "extends": "../../../../js/tests/unit/.eslintrc.json" } diff --git a/site/docs/4.1/examples/.stylelintrc b/site/docs/4.1/examples/.stylelintrc index 6a77dcedb652..06c67b5ff3ab 100644 --- a/site/docs/4.1/examples/.stylelintrc +++ b/site/docs/4.1/examples/.stylelintrc @@ -1,5 +1,5 @@ { - "extends": "../../../.stylelintrc", + "extends": "../../../../.stylelintrc", "rules": { "at-rule-no-vendor-prefix": null, "comment-empty-line-before": null,