Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • B bootstrap
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 263
    • Issues 263
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 114
    • Merge requests 114
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • Bootstrap
  • bootstrap
  • Merge requests
  • !27015

More path fixes and doc tweaks

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged XhmikosR requested to merge v4-dev-xmr-dev into v4-dev 6 years ago
  • Overview 0
  • Commits 5
  • Pipelines 0
  • Changes 5

@Johann-S: do not merge please

@mdo: please confirm.

Refs #26994 (closed)

Compare
  • v4-dev (base)

and
  • latest version
    561fb6eb
    5 commits, 2 years ago

5 files
+ 8
- 13

    Preferences

    File browser
    Compare changes
si‎te‎
_d‎ata‎
translat‎ions.yml‎ +0 -5
docs‎/4.1‎
compo‎nents‎
form‎s.md‎ +1 -1
exam‎ples‎
.eslint‎rc.json‎ +1 -1
.style‎lintrc‎ +1 -1
packag‎e.json‎ +5 -5
site/_data/translations.yml
+ 0
- 5
  • View file @ 561fb6eb

  • Edit in single-file editor

  • Open in Web IDE


@@ -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
site/docs/4.1/components/forms.md
+ 1
- 1
  • View file @ 561fb6eb

  • Edit in single-file editor

  • Open in Web IDE


@@ -1111,7 +1111,7 @@ We use the sibling selector (`~`) for all our `<input>` states—like `:checked`
We hide the default `<input>` 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 `<input>` 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
site/docs/4.1/examples/.eslintrc.json
+ 1
- 1
  • View file @ 561fb6eb

  • Edit in single-file editor

  • Open in Web IDE


@@ -7,5 +7,5 @@
"ecmaVersion": 5,
"sourceType": "script"
},
"extends": "../../../js/tests/unit/.eslintrc.json"
"extends": "../../../../js/tests/unit/.eslintrc.json"
}
site/docs/4.1/examples/.stylelintrc
+ 1
- 1
  • View file @ 561fb6eb

  • Edit in single-file editor

  • Open in Web IDE


{
"extends": "../../../.stylelintrc",
"extends": "../../../../.stylelintrc",
"rules": {
"at-rule-no-vendor-prefix": null,
"comment-empty-line-before": null,
package.json
+ 5
- 5
  • View file @ 561fb6eb

  • Edit in single-file editor

  • Open in Web IDE


@@ -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\"",
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
2
build v4
2
build v4
    Assign labels
  • Manage project labels

Milestone
No milestone
None
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
3
3 participants
XhmikosR
Mark Otto
Administrator
Reference: twbs/bootstrap!27015
Source branch: v4-dev-xmr-dev

Menu

Explore Projects Groups Snippets