Skip to content

Commit 33f6c07

Browse files
MartijnCuppensMartijnCuppens
authored
Merge branch 'master' into master-mc-change-breakpoint-behavior
2 parents f87c562 + eb849d7 commit 33f6c07

File tree

11 files changed

+465
-501
lines changed

11 files changed

+465
-501
lines changed

‎package-lock.json

+434-445
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+16-13
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"scripts": {
2121
"start": "npm-run-all --parallel watch docs-serve",
2222
"bundlesize": "bundlesize",
23-
"coveralls": "shx cat js/coverage/lcov.info | coveralls",
23+
"coveralls": "cat js/coverage/lcov.info | coveralls",
2424
"css": "npm-run-all css-compile css-prefix css-minify",
2525
"css-compile": "node-sass --output-style expanded --source-map true --source-map-contents true --precision 6 scss/ -o dist/css/",
2626
"css-lint": "npm-run-all --continue-on-error --parallel css-lint-*",
@@ -56,19 +56,19 @@
5656
"docs-lint": "npm-run-all --parallel docs-vnu docs-linkinator",
5757
"docs-serve": "hugo server --port 9001 --disableFastRender",
5858
"docs-serve-only": "serve _gh_pages --listen 9001",
59-
"update-deps": "ncu -a -x karma-browserstack-launcher && npm update && shx echo Manually update site/assets/js/vendor",
59+
"update-deps": "ncu -a -x karma-browserstack-launcher && npm update && echo Manually update site/assets/js/vendor",
6060
"release": "npm-run-all dist release-sri release-zip docs-production",
6161
"release-sri": "node build/generate-sri.js",
6262
"release-version": "node build/change-version.js",
63-
"release-zip": "cross-env-shell \"shx rm -rf bootstrap-$npm_package_version-dist && shx cp -r dist/ bootstrap-$npm_package_version-dist && zip -r9 bootstrap-$npm_package_version-dist.zip bootstrap-$npm_package_version-dist && shx rm -rf bootstrap-$npm_package_version-dist\"",
63+
"release-zip": "cross-env-shell \"rm -rf bootstrap-$npm_package_version-dist && cp -r dist/ bootstrap-$npm_package_version-dist && zip -r9 bootstrap-$npm_package_version-dist.zip bootstrap-$npm_package_version-dist && rm -rf bootstrap-$npm_package_version-dist\"",
6464
"dist": "npm-run-all --parallel css js",
6565
"test": "npm-run-all lint dist js-test docs-build docs-lint",
6666
"netlify": "npm-run-all dist release-sri docs-production",
6767
"watch": "npm-run-all --parallel watch-*",
6868
"watch-css-main": "nodemon --watch scss/ --ext scss --exec \"npm-run-all css-lint css-compile css-prefix\"",
6969
"watch-css-docs": "nodemon --watch site/assets/scss/ --ext scss --exec \"npm run css-lint\"",
7070
"watch-js-main": "nodemon --watch js/src/ --ext js --exec \"npm-run-all js-lint js-compile\"",
71-
"watch-js-docs": "nodemon --watch site/assets/js/src/ --ext js --exec \"npm run js-lint\""
71+
"watch-js-docs": "nodemon --watch site/assets/js/ --ext js --exec \"npm run js-lint\""
7272
},
7373
"style": "dist/css/bootstrap.css",
7474
"sass": "scss/bootstrap.scss",
@@ -87,11 +87,11 @@
8787
"popper.js": "^1.16.0"
8888
},
8989
"devDependencies": {
90-
"@babel/cli": "^7.6.4",
91-
"@babel/core": "^7.6.4",
90+
"@babel/cli": "^7.7.0",
91+
"@babel/core": "^7.7.2",
9292
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
93-
"@babel/preset-env": "^7.6.3",
94-
"autoprefixer": "^9.7.0",
93+
"@babel/preset-env": "^7.7.1",
94+
"autoprefixer": "^9.7.1",
9595
"babel-eslint": "^10.0.3",
9696
"babel-plugin-istanbul": "^5.2.0",
9797
"bundlesize": "^0.18.0",
@@ -103,9 +103,9 @@
103103
"eslint-plugin-import": "^2.18.2",
104104
"eslint-plugin-unicorn": "^12.1.0",
105105
"find-unused-sass-variables": "^1.0.2",
106-
"glob": "^7.1.5",
106+
"glob": "^7.1.6",
107107
"hammer-simulator": "0.0.1",
108-
"hugo-bin": "^0.47.0",
108+
"hugo-bin": "^0.47.1",
109109
"ip": "^1.1.5",
110110
"jasmine-core": "^3.5.0",
111111
"karma": "^4.4.1",
@@ -117,20 +117,19 @@
117117
"karma-jasmine": "^2.0.1",
118118
"karma-jasmine-html-reporter": "^1.4.2",
119119
"karma-rollup-preprocessor": "^7.0.2",
120-
"linkinator": "^1.6.0",
120+
"linkinator": "^1.6.3",
121121
"node-sass": "^4.13.0",
122122
"nodemon": "^1.19.4",
123123
"npm-run-all": "^4.1.5",
124124
"popper.js": "^1.16.0",
125125
"postcss-cli": "^6.1.3",
126-
"rollup": "^1.26.0",
126+
"rollup": "^1.26.3",
127127
"rollup-plugin-babel": "^4.3.3",
128128
"rollup-plugin-commonjs": "^10.1.0",
129129
"rollup-plugin-istanbul": "^2.0.1",
130130
"rollup-plugin-node-resolve": "^5.2.0",
131131
"serve": "^11.2.0",
132132
"shelljs": "^0.8.3",
133-
"shx": "^0.3.2",
134133
"stylelint": "^11.1.1",
135134
"stylelint-config-twbs-bootstrap": "^0.9.0",
136135
"terser": "^4.3.9",
@@ -164,5 +163,9 @@
164163
"peerDependencies": {
165164
"popper.js": "^1.16.0"
166165
}
166+
},
167+
"funding": {
168+
"type": "opencollective",
169+
"url": "https://opencollective.com/bootstrap"
167170
}
168171
}

‎scss/_progress.scss

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
display: flex;
2020
flex-direction: column;
2121
justify-content: center;
22+
overflow: hidden;
2223
color: $progress-bar-color;
2324
text-align: center;
2425
white-space: nowrap;

‎scss/_variables.scss

+3-2
Original file line numberDiff line numberDiff line change
@@ -621,8 +621,8 @@ $input-height-inner-half: add($input-line-height * .5em, $input-pa
621621
$input-height-inner-quarter: add($input-line-height * .25em, $input-padding-y / 2) !default;
622622

623623
$input-height: add($input-line-height * 1em, add($input-padding-y * 2, $input-height-border, false)) !default;
624-
$input-height-sm: add($input-line-height * 1em, add($input-btn-padding-y-sm * 2, $input-height-border, false)) !default;
625-
$input-height-lg: add($input-line-height * 1em, add($input-btn-padding-y-lg * 2, $input-height-border, false)) !default;
624+
$input-height-sm: add($input-line-height * 1em, add($input-padding-y-sm * 2, $input-height-border, false)) !default;
625+
$input-height-lg: add($input-line-height * 1em, add($input-padding-y-lg * 2, $input-height-border, false)) !default;
626626

627627
$input-transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out !default;
628628

@@ -631,6 +631,7 @@ $form-check-input-width: 1.25em !default;
631631
$form-check-min-height: $font-size-base * $line-height-base !default;
632632
$form-check-padding-left: $form-check-input-width + .5em !default;
633633
$form-check-margin-bottom: .125rem !default;
634+
$form-check-label-cursor: null !default;
634635

635636
$form-check-input-active-filter: brightness(90%) !default;
636637

‎scss/forms/_form-check.scss

+1
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@
9595

9696
.form-check-label {
9797
margin-bottom: 0;
98+
cursor: $form-check-label-cursor;
9899
}
99100

100101
//

‎site/assets/js/src/application.js renamed to ‎site/assets/js/application.js

+2-4
Original file line numberDiff line numberDiff line change
@@ -156,12 +156,10 @@
156156
var fallbackMsg = 'Press ' + modifierKey + 'C to copy'
157157
var tooltipBtn = bootstrap.Tooltip.getInstance(e.trigger)
158158

159-
e.trigger.setAttribute('title', fallbackMsg)
160-
tooltipBtn._fixTitle()
159+
e.trigger.setAttribute('data-original-title', fallbackMsg)
161160
tooltipBtn.show()
162161

163-
e.trigger.setAttribute('title', 'Copy to clipboard')
164-
tooltipBtn._fixTitle()
162+
e.trigger.setAttribute('data-original-title', 'Copy to clipboard')
165163
})
166164

167165
anchors.options = {

‎site/assets/js/src/search.js renamed to ‎site/assets/js/search.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
// When in production, return the result as is,
4141
// otherwise remove our url from it.
4242
// eslint-disable-next-line no-negated-condition
43-
hit.url = currentUrl.indexOf(liveUrl) !== -1 ?
43+
hit.url = currentUrl.indexOf(liveUrl) !== -1 ? // lgtm [js/incomplete-url-substring-sanitization]
4444
hit.url :
4545
hit.url.replace(liveUrl, '')
4646

‎site/content/docs/4.3/components/modal.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ Bootstrap's modal class exposes a few events for hooking into modal functionalit
920920
</tr>
921921
<tr>
922922
<td>hidePrevented.bs.modal</td>
923-
<td>This event is fired when the modal is shown, its backdrop is <code>static</code> and a click outside the modal or a scape key press is performed.</td>
923+
<td>This event is fired when the modal is shown, its backdrop is <code>static</code> and a click outside the modal or an escape key press is performed.</td>
924924
</tr>
925925
</tbody>
926926
</table>

‎site/content/docs/4.3/examples/dashboard/index.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
extra_css:
55
- "dashboard.css"
66
extra_js:
7-
- src: "https://cdnjs.cloudflare.com/ajax/libs/feather-icons/4.22.1/feather.min.js"
8-
integrity: "sha384-tEnKX7JRZR3t38wJHXt8BT5ppaydaUUN2CeogIibPz/xb1U+6veCoNuqGVMMXUMm"
7+
- src: "https://cdnjs.cloudflare.com/ajax/libs/feather-icons/4.24.1/feather.min.js"
8+
integrity: "sha384-EbSscX4STvYAC/DxHse8z5gEDaNiKAIGW+EpfzYTfQrgIlHywXXrM9SUIZ0BlyfF"
99
- src: "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.8.0/Chart.min.js"
1010
integrity: "sha384-QzN1ywg2QLsf72ZkgRHgjkB/cfI4Dqjg6RJYQUqH6Wm8qp/MvmEYn+2NBsLnhLkr"
1111
- src: "dashboard.js"

‎site/layouts/partials/scripts.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
{{- end }}
1010

1111
{{- $vendor := resources.Match "js/vendor/*.js" -}}
12-
{{- $js := resources.Match "js/src/*.js" -}}
12+
{{- $js := resources.Match "js/*.js" -}}
1313
{{- $targetDocsJSPath := printf "/docs/%s/assets/js/docs.js" .Site.Params.docs_version -}}
1414
{{- $docsJs := append $js $vendor | resources.Concat $targetDocsJSPath -}}
1515

‎site/layouts/shortcodes/example.html

+3-32
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,7 @@
1919
{{- end -}}
2020

2121
{{- if eq $show_markup true -}}
22-
{{- $.Scratch.Set "highlight_content" $input -}}
23-
24-
{{- if (strings.Contains $input `<svg class="bd-placeholder-img`) -}}
25-
{{- $.Scratch.Set "highlight_content" "" -}}
26-
27-
{{- $modified_content := replace $input `<svg class="bd-placeholder-img` `✂️<svg class="bd-placeholder-img` -}}
28-
{{- $modified_content = replace $modified_content "</svg>\n" "</svg>✂️" -}}
29-
{{- $modified_content = split $modified_content "✂️" -}}
30-
31-
{{- range $content_chunk := $modified_content -}}
32-
{{- $image_class := "" -}}
33-
34-
{{- if (strings.Contains $content_chunk `<svg class="bd-placeholder-img `) -}}
35-
{{- $image_class = replace $content_chunk "bd-placeholder-img " "bd-placeholder-img ✂️ " -}}
36-
{{- $image_class = split (replace $image_class `" width="` `✂️" width="`) "✂️" -}}
37-
{{- $image_class = replace (index $image_class 1) "bd-placeholder-img-lg" "" -}}
38-
{{- $image_class = trim $image_class " " -}}
39-
{{- end -}}
40-
41-
{{- if (strings.Contains $content_chunk `<svg class="bd-placeholder-img`) -}}
42-
{{- if $image_class -}}
43-
{{- $.Scratch.Add "highlight_content" (printf `<img src="..." class="%s" alt="...">` $image_class) -}}
44-
{{- else -}}
45-
{{- $.Scratch.Add "highlight_content" `<img src="..." alt="...">` -}}
46-
{{- end -}}
47-
{{- else -}}
48-
{{- $.Scratch.Add "highlight_content" $content_chunk -}}
49-
{{- end -}}
50-
{{- end -}}
51-
{{- end -}}
52-
53-
{{- highlight (trim ($.Scratch.Get "highlight_content") "\n") "html" "" -}}
22+
{{- $content := replaceRE `<svg class="bd\-placeholder\-img(?:\-lg)?(?: *?bd\-placeholder\-img\-lg)? ?(.*?)".*?<\/svg>\n` `<img src="..." class="$1" alt="...">` $input -}}
23+
{{- $content = replaceRE `(class=" *?")` "" $content -}}
24+
{{- highlight (trim $content "\n") "html" "" -}}
5425
{{- end -}}

0 commit comments

Comments
 (0)