Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v4-dev backports and updates #33807

Merged
merged 7 commits into from
May 21, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"plugin:import/errors",
"plugin:import/warnings",
"plugin:unicorn/recommended",
"xo/esnext",
"xo",
"xo/browser"
],
"rules": {
Expand Down Expand Up @@ -52,6 +52,7 @@
"unicorn/prefer-dom-node-remove": "off",
"unicorn/prefer-includes": "off",
"unicorn/prefer-math-trunc": "off",
"unicorn/prefer-module": "off",
"unicorn/prefer-number-properties": "off",
"unicorn/prefer-optional-catch-binding": "off",
"unicorn/prefer-query-selector": "off",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node: [10, 12, 14]
node: [12, 14, 16]

steps:
- name: Clone repository
Expand Down
1,364 changes: 728 additions & 636 deletions package-lock.json

Large diffs are not rendered by default.

38 changes: 19 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,26 +94,26 @@
"popper.js": "^1.16.1"
},
"devDependencies": {
"@babel/cli": "^7.13.14",
"@babel/core": "^7.13.14",
"@babel/preset-env": "^7.13.12",
"@babel/cli": "^7.14.3",
"@babel/core": "^7.14.3",
"@babel/preset-env": "^7.14.2",
"@rollup/plugin-babel": "^5.3.0",
"@rollup/plugin-commonjs": "^18.0.0",
"@rollup/plugin-node-resolve": "^11.2.1",
"@rollup/plugin-commonjs": "^19.0.0",
"@rollup/plugin-node-resolve": "^13.0.0",
"autoprefixer": "^10.2.5",
"babel-plugin-istanbul": "^6.0.0",
"bundlewatch": "^0.3.2",
"clean-css-cli": "^5.2.2",
"clean-css-cli": "^5.3.0",
"cross-env": "^7.0.3",
"eslint": "^7.23.0",
"eslint-config-xo": "^0.35.0",
"eslint-plugin-import": "^2.22.1",
"eslint-plugin-unicorn": "^29.0.0",
"eslint": "^7.26.0",
"eslint-config-xo": "^0.36.0",
"eslint-plugin-import": "^2.23.2",
"eslint-plugin-unicorn": "^31.0.0",
"find-unused-sass-variables": "^3.1.0",
"glob": "^7.1.6",
"glob": "^7.1.7",
"globby": "^11.0.3",
"hammer-simulator": "0.0.1",
"hugo-bin": "^0.70.0",
"hugo-bin": "^0.71.1",
"ip": "^1.1.5",
"jquery": "3.5.1",
"karma": "^6.3.2",
Expand All @@ -126,20 +126,20 @@
"karma-sinon": "^1.0.5",
"linkinator": "^2.13.6",
"lockfile-lint": "^4.6.2",
"node-sass": "^5.0.0",
"node-sass": "^6.0.0",
"nodemon": "^2.0.7",
"npm-run-all": "^4.1.5",
"popper.js": "^1.16.1",
"postcss": "^8.2.9",
"postcss": "^8.3.0",
"postcss-cli": "^8.3.1",
"qunit": "^2.14.1",
"rollup": "^2.44.0",
"qunit": "^2.15.0",
"rollup": "^2.48.0",
"shelljs": "^0.8.4",
"sinon": "^7.5.0",
"stylelint": "^13.12.0",
"stylelint-config-twbs-bootstrap": "^2.1.0",
"stylelint": "^13.13.1",
"stylelint-config-twbs-bootstrap": "^2.2.0",
"terser": "5.1.0",
"vnu-jar": "21.2.5"
"vnu-jar": "21.4.9"
},
"files": [
"dist/{css,js}/*.{css,js,map}",
Expand Down
4 changes: 2 additions & 2 deletions scss/_spinners.scss
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
display: inline-block;
width: $spinner-width;
height: $spinner-height;
vertical-align: text-bottom;
vertical-align: $spinner-vertical-align;
border: $spinner-border-width solid currentColor;
border-right-color: transparent;
// stylelint-disable-next-line property-disallowed-list
Expand Down Expand Up @@ -42,7 +42,7 @@
display: inline-block;
width: $spinner-width;
height: $spinner-height;
vertical-align: text-bottom;
vertical-align: $spinner-vertical-align;
background-color: currentColor;
// stylelint-disable-next-line property-disallowed-list
border-radius: 50%;
Expand Down
7 changes: 4 additions & 3 deletions scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -1101,9 +1101,10 @@ $carousel-transition: transform $carousel-transition-duration eas

// Spinners

$spinner-width: 2rem !default;
$spinner-height: $spinner-width !default;
$spinner-border-width: .25em !default;
$spinner-width: 2rem !default;
$spinner-height: $spinner-width !default;
$spinner-vertical-align: -.125em !default;
$spinner-border-width: .25em !default;

$spinner-width-sm: 1rem !default;
$spinner-height-sm: $spinner-width-sm !default;
Expand Down
2 changes: 2 additions & 0 deletions scss/bootstrap-grid.scss
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ html {
box-sizing: inherit;
}

// stylelint-disable no-invalid-position-at-import-rule

@import "functions";
@import "variables";

Expand Down
5 changes: 5 additions & 0 deletions site/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,14 @@
"SwitchCase": 1
}
],
"no-var": "off",
"object-curly-spacing": [
"error",
"always"
],
"object-shorthand": "off",
"prefer-arrow-callback": "off",
"prefer-destructuring": "off",
"semi": [
"error",
"never"
Expand All @@ -39,6 +43,7 @@
"unicorn/prefer-dom-node-dataset": "off",
"unicorn/prefer-includes": "off",
"unicorn/prefer-number-properties": "off",
"unicorn/prefer-module": "off",
"unicorn/prefer-query-selector": "off",
"unicorn/prevent-abbreviations": "off"
}
Expand Down
8 changes: 4 additions & 4 deletions site/assets/js/vendor/anchor.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading