rev/bootstrap
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into new-border-bg-utils

Browse source
This commit is contained in:
XhmikosR 2020-11-17 15:43:43 +02:00 • committed by GitHub
commit 167b44e425
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 31 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

13
js/tests/browsers.js
View file

@ -37,11 +37,18 @@ const browsers = {
browser: 'Firefox',
browser_version: 'latest'
},
iphoneX: {
iphone7: {
base: 'BrowserStack',
os: 'ios',
os_version: '11.0',
device: 'iPhone X',
os_version: '10.0',
device: 'iPhone 7',
real_mobile: true
},
iphone11: {
base: 'BrowserStack',
os: 'ios',
os_version: '13.0',
device: 'iPhone 11',
real_mobile: true
},
pixel2: {

24
package-lock.json generated
View file

@ -1914,9 +1914,9 @@
"dev": true
},
"base64-js": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
"dev": true
},
"base64id": {
@ -5478,9 +5478,9 @@
}
},
"hugo-bin": {
"version": "0.66.1",
"resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.66.1.tgz",
"integrity": "sha512-enMlGVAS2qVQZiX1CYPMD8Dihh+zLVgqPAsip8Hques1U1M1mPNf01cGoAZXuMscyo8B5/qBWhDqRimNMFLuKg==",
"version": "0.66.2",
"resolved": "https://registry.npmjs.org/hugo-bin/-/hugo-bin-0.66.2.tgz",
"integrity": "sha512-T/U35qAnzKubHzMi10uolB50e+RgHigHyAEnhGy6upCEp2H1sbDtsmqyzIhc+gMK8VIzJoU3vg/nqfpkFKOwsA==",
"dev": true,
"requires": {
"bin-wrapper": "^4.1.0",
@ -8310,9 +8310,9 @@
"optional": true
},
"postcss": {
"version": "8.1.6",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.6.tgz",
"integrity": "sha512-JuifSl4h8dJ70SiMXKjzCxhalE6p2TnMHuq9G8ftyXj2jg6SXzqCsEuxMj9RkmJoO5D+Z9YrWunNkxqpRT02qg==",
"version": "8.1.7",
"resolved": "https://registry.npmjs.org/postcss/-/postcss-8.1.7.tgz",
"integrity": "sha512-llCQW1Pz4MOPwbZLmOddGM9eIJ8Bh7SZ2Oj5sxZva77uVaotYDsYTch1WBTNu7fUY0fpWp0fdt7uW40D4sRiiQ==",
"dev": true,
"requires": {
"colorette": "^1.2.1",
@ -9299,9 +9299,9 @@
}
},
"rollup": {
"version": "2.33.1",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz",
"integrity": "sha512-uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w==",
"version": "2.33.2",
"resolved": "https://registry.npmjs.org/rollup/-/rollup-2.33.2.tgz",
"integrity": "sha512-QPQ6/fWCrzHtSXkI269rhKaC7qXGghYBwXU04b1JsDZ6ibZa3DJ9D1SFAYRMgx1inDg0DaTbb3N4Z1NK/r3fhw==",
"dev": true,
"requires": {
"fsevents": "~2.1.2"

6
package.json
View file

@ -109,7 +109,7 @@
"find-unused-sass-variables": "^3.0.0",
"glob": "^7.1.6",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.66.1",
"hugo-bin": "^0.66.2",
"ip": "^1.1.5",
"jquery": "^3.5.1",
"karma": "^5.2.3",
@ -126,9 +126,9 @@
"nodemon": "^2.0.6",
"npm-run-all": "^4.1.5",
"popper.js": "^1.16.1",
"postcss": "^8.1.6",
"postcss": "^8.1.7",
"postcss-cli": "^8.2.0",
"rollup": "^2.33.1",
"rollup": "^2.33.2",
"rollup-plugin-istanbul": "^2.0.1",
"sass": "^1.29.0",
"shelljs": "^0.8.4",

8
site/content/docs/5.0/examples/dashboard/index.html
View file

@ -4,10 +4,10 @@ title: Dashboard Template
extra_css:
- "dashboard.css"
extra_js:
- src: "https://cdnjs.cloudflare.com/ajax/libs/feather-icons/4.24.1/feather.min.js"
integrity: "sha384-EbSscX4STvYAC/DxHse8z5gEDaNiKAIGW+EpfzYTfQrgIlHywXXrM9SUIZ0BlyfF"
- src: "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.9.3/Chart.min.js"
integrity: "sha384-i+dHPTzZw7YVZOx9lbH5l6lP74sLRtMtwN2XjVqjf3uAGAREAF4LMIUDTWEVs4LI"
- src: "https://cdn.jsdelivr.net/npm/feather-icons@4.28.0/dist/feather.min.js"
integrity: "sha384-uO3SXW5IuS1ZpFPKugNNWqTZRRglnUJK6UAZ/gxOX80nxEkN9NcGZTftn6RzhGWE"
- src: "https://cdn.jsdelivr.net/npm/chart.js@2.9.4/dist/Chart.min.js"
integrity: "sha384-zNy6FEbO50N+Cg5wap8IKA4M/ZnLJgzc6w2NqACZaK0u0FXfOWRRJOnQtpZun8ha"
- src: "dashboard.js"
---

4
site/content/docs/5.0/examples/masonry/index.html
View file

@ -2,7 +2,7 @@
layout: examples
title: Masonry example
extra_js:
- src: "https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js"
- src: "https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js"
integrity: "sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D"
async: true
---
@ -14,7 +14,7 @@ extra_js:
<p>Masonry is not included in Bootstrap. Add it by including the JavaScript plugin manually, or using a CDN like so:</p>
<pre><code>
&lt;script src=&quot;https://cdnjs.cloudflare.com/ajax/libs/masonry/4.2.2/masonry.pkgd.min.js&quot; integrity=&quot;sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D&quot; crossorigin=&quot;anonymous&quot; async&gt;&lt;/script&gt;
&lt;script src=&quot;https://cdn.jsdelivr.net/npm/masonry-layout@4.2.2/dist/masonry.pkgd.min.js&quot; integrity=&quot;sha384-GNFwBvfVxBkLMJpYMOABq3c+d3KnQxudP/mGPkzpZSTYykLBNsZEnG2D9G/X/+7D&quot; crossorigin=&quot;anonymous&quot; async&gt;&lt;/script&gt;
</code></pre>
<p>By adding <code>data-masonry='{"percentPosition": true }'</code> to the <code>.row</code> wrapper, we can combine the powers of Bootstrap's responsive grid and Masonry's positioning.</p>