From 480e7e61b602bcf6475b39d1180d8ab0c57bc878 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Jan 2021 16:52:31 +0200 Subject: [PATCH 1/8] Bump autoprefixer from 10.1.0 to 10.2.0 (#32711) Bumps [autoprefixer](https://github.com/postcss/autoprefixer) from 10.1.0 to 10.2.0. - [Release notes](https://github.com/postcss/autoprefixer/releases) - [Changelog](https://github.com/postcss/autoprefixer/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/autoprefixer/compare/10.1.0...10.2.0) Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package-lock.json | 27 +++++++++++++++++++++------ package.json | 2 +- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1603b1ba2..e3dd0cee0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1612,17 +1612,32 @@ "optional": true }, "autoprefixer": { - "version": "10.1.0", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.1.0.tgz", - "integrity": "sha512-0/lBNwN+ZUnb5su18NZo5MBIjDaq6boQKZcxwy86Gip/CmXA2zZqUoFQLCNAGI5P25ZWSP2RWdhDJ8osfKEjoQ==", + "version": "10.2.0", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.2.0.tgz", + "integrity": "sha512-5SdPoK2Q3rxVh4xC8GKdy772KbEESdl2SyJADCw5FMUrd5eNtpOTLo7oCFMEKvK86zQdvsIVTYk93E8dAfRy6g==", "dev": true, "requires": { - "browserslist": "^4.15.0", - "caniuse-lite": "^1.0.30001165", + "browserslist": "^4.16.1", + "caniuse-lite": "^1.0.30001173", "colorette": "^1.2.1", - "fraction.js": "^4.0.12", + "fraction.js": "^4.0.13", "normalize-range": "^0.1.2", "postcss-value-parser": "^4.1.0" + }, + "dependencies": { + "browserslist": { + "version": "4.16.1", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.1.tgz", + "integrity": "sha512-UXhDrwqsNcpTYJBTZsbGATDxZbiVDsx6UjpmRUmtnP10pr8wAYr5LgFoEFw9ixriQH2mv/NX2SfGzE/o8GndLA==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001173", + "colorette": "^1.2.1", + "electron-to-chromium": "^1.3.634", + "escalade": "^3.1.1", + "node-releases": "^1.1.69" + } + } } }, "axios": { diff --git a/package.json b/package.json index b58b3c42b..6a6fc40a0 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,7 @@ "@rollup/plugin-commonjs": "^17.0.0", "@rollup/plugin-node-resolve": "^11.0.1", "@rollup/plugin-replace": "^2.3.4", - "autoprefixer": "^10.1.0", + "autoprefixer": "^10.2.0", "bundlewatch": "^0.3.1", "clean-css-cli": "^4.3.0", "cross-env": "^7.0.3", From d9adaae5b0fe41e237f20f2dc1232a1025af9d1b Mon Sep 17 00:00:00 2001 From: XhmikosR Date: Fri, 4 Dec 2020 11:53:14 +0200 Subject: [PATCH 2/8] Move migration sidebar entry to sidebar.yml --- site/data/sidebar.yml | 6 ++- site/layouts/partials/docs-sidebar.html | 50 ++++++++++++------------- 2 files changed, 30 insertions(+), 26 deletions(-) diff --git a/site/data/sidebar.yml b/site/data/sidebar.yml index 80256e9f0..a4d4ccbbd 100644 --- a/site/data/sidebar.yml +++ b/site/data/sidebar.yml @@ -1,3 +1,6 @@ +# This file holds all sidebar menu's entries. +# The logic for the sidebar generation is in "site/layouts/partials/docs-sidebar.html". + - title: Getting started pages: - title: Introduction @@ -26,7 +29,6 @@ - title: Breakpoints - title: Containers - title: Grid - # - title: Rows - title: Columns - title: Gutters - title: Utilities @@ -117,3 +119,5 @@ - title: Brand - title: License - title: Translations + +- title: Migration diff --git a/site/layouts/partials/docs-sidebar.html b/site/layouts/partials/docs-sidebar.html index 94acb4786..ba974f4cd 100644 --- a/site/layouts/partials/docs-sidebar.html +++ b/site/layouts/partials/docs-sidebar.html @@ -13,33 +13,33 @@ {{- end -}} {{- $group_slug := $group.title | urlize -}} - {{- $is_active_group := eq $.Page.Params.group $group_slug }} + {{- $is_active_group := eq $.Page.Params.group $group_slug -}} -
  • - + {{- if $group.pages }} +
  • + - {{- if $group.pages }} -
    -
      - {{- range $doc := $group.pages -}} - {{- $doc_slug := $doc.title | urlize -}} - {{- $is_active := and $is_active_group (eq $page_slug $doc_slug) -}} - {{- $href := printf "/docs/%s/%s/%s/" $.Site.Params.docs_version $group_slug $doc_slug }} -
    • {{ $doc.title }}
      • - {{- end }} -
    -
    - {{- end }} -
    • +
    +
      + {{- range $doc := $group.pages -}} + {{- $doc_slug := $doc.title | urlize -}} + {{- $is_active := and $is_active_group (eq $page_slug $doc_slug) -}} + {{- $href := printf "/docs/%s/%s/%s/" $.Site.Params.docs_version $group_slug $doc_slug }} +
    • {{ $doc.title }}
      • + {{- end }} +
    +
    + + {{- else }} +
  • + + + {{ $group.title }} + + + {{- end }} {{- end }} - -
  • - - - Migration - - From 70175db4294641c91e825b5e2555e7d7d398e320 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABl=20Poupard?= Date: Mon, 14 Dec 2020 14:48:08 +0100 Subject: [PATCH 3/8] docs(sidebar): active link --- site/layouts/partials/docs-sidebar.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site/layouts/partials/docs-sidebar.html b/site/layouts/partials/docs-sidebar.html index ba974f4cd..eec268ceb 100644 --- a/site/layouts/partials/docs-sidebar.html +++ b/site/layouts/partials/docs-sidebar.html @@ -16,7 +16,7 @@ {{- $is_active_group := eq $.Page.Params.group $group_slug -}} {{- if $group.pages }} -
  • +
  • @@ -34,8 +34,8 @@
    • {{- else }}
  • - - +
  • + {{ $group.title }}
    • From 80557b3ac02bb21823a483013d9a0af5203bb7c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Helleboid=20-=20chtitux?= Date: Fri, 8 Jan 2021 22:53:04 +0400 Subject: [PATCH 4/8] Move "active" class from `.nav-item` to `.nav-link` (#32730) --- js/tests/unit/scrollspy.spec.js | 4 +- js/tests/visual/dropdown.html | 4 +- js/tests/visual/modal.html | 4 +- .../5.0/examples/navbar-bottom/index.html | 4 +- .../docs/5.0/examples/navbar-fixed/index.html | 4 +- .../5.0/examples/navbar-static/index.html | 4 +- .../docs/5.0/examples/navbars/index.html | 48 +++++++++---------- .../docs/5.0/examples/offcanvas/index.html | 4 +- .../5.0/examples/starter-template/index.html | 4 +- .../examples/sticky-footer-navbar/index.html | 4 +- 10 files changed, 42 insertions(+), 42 deletions(-) diff --git a/js/tests/unit/scrollspy.spec.js b/js/tests/unit/scrollspy.spec.js index 45de56fbe..eab9183aa 100644 --- a/js/tests/unit/scrollspy.spec.js +++ b/js/tests/unit/scrollspy.spec.js @@ -68,7 +68,7 @@ describe('ScrollSpy', () => { fixtureEl.innerHTML = [ '