From 7e6d7b8f817ad1212238f15124335d37c93ebfea Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@gmail.com>
Date: Sun, 10 Jan 2021 08:03:49 +0200
Subject: [PATCH 1/2] package.json: move `version_short` variable under the
 `config` object (#32737)

This is so that it works on npm 7.x too.
---
 build/zip-examples.js | 5 +++--
 package.json          | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build/zip-examples.js b/build/zip-examples.js
index c98ed9763..898e5860f 100644
--- a/build/zip-examples.js
+++ b/build/zip-examples.js
@@ -12,9 +12,10 @@
 const path = require('path')
 const sh = require('shelljs')
 
-const { version, version_short: versionShort } = require('../package.json')
+const pkg = require('../package.json')
 
-const folderName = `bootstrap-${version}-examples`
+const versionShort = pkg.config.version_short
+const folderName = `bootstrap-${pkg.version}-examples`
 
 sh.config.fatal = true
 
diff --git a/package.json b/package.json
index 51e7fdb34..0c3a36e35 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,9 @@
   "name": "bootstrap",
   "description": "The most popular front-end framework for developing responsive, mobile first projects on the web.",
   "version": "5.0.0-beta1",
-  "version_short": "5.0",
+  "config": {
+    "version_short": "5.0"
+  },
   "keywords": [
     "css",
     "sass",
@@ -32,7 +34,7 @@
     "css-prefix": "npm-run-all --parallel css-prefix-*",
     "css-prefix-main": "postcss --config build/postcss.config.js --replace \"dist/css/*.css\" \"!dist/css/*.rtl*.css\" \"!dist/css/*.min.css\"",
     "css-prefix-examples": "postcss --config build/postcss.config.js --replace \"site/content/**/*.css\"",
-    "css-prefix-examples-rtl": "cross-env-shell NODE_ENV=RTL postcss --config build/postcss.config.js --dir \"site/content/docs/$npm_package_version_short/examples/\" --ext \".rtl.css\" --base \"site/content/docs/$npm_package_version_short/examples/\" \"site/content/docs/$npm_package_version_short/examples/{blog,carousel,dashboard,cheatsheet}/*.css\" \"!site/content/docs/$npm_package_version_short/examples/{blog,carousel,dashboard,cheatsheet}/*.rtl.css\"",
+    "css-prefix-examples-rtl": "cross-env-shell NODE_ENV=RTL postcss --config build/postcss.config.js --dir \"site/content/docs/$npm_package_config_version_short/examples/\" --ext \".rtl.css\" --base \"site/content/docs/$npm_package_config_version_short/examples/\" \"site/content/docs/$npm_package_config_version_short/examples/{blog,carousel,dashboard,cheatsheet}/*.css\" \"!site/content/docs/$npm_package_config_version_short/examples/{blog,carousel,dashboard,cheatsheet}/*.rtl.css\"",
     "js": "npm-run-all js-compile js-minify",
     "js-compile": "npm-run-all --parallel js-compile-*",
     "js-compile-standalone": "rollup --environment BUNDLE:false --config build/rollup.config.js --sourcemap",

From a2ae2c364f0fe58bf2abbd87cfd5af5d0bf57326 Mon Sep 17 00:00:00 2001
From: "Patrick H. Lauke" <redux@splintered.co.uk>
Date: Sun, 10 Jan 2021 10:42:26 +0000
Subject: [PATCH 2/2] Suppress focus outline for buttons when it shouldn't be
 visible in Chromium (#32689)

Follow-up to https://github.com/twbs/bootstrap/pull/32631

Co-authored-by: XhmikosR <xhmikosr@gmail.com>
---
 scss/_reboot.scss | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index 58e1a34d0..973b5d16c 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -411,6 +411,15 @@ button {
   border-radius: 0;
 }
 
+// Explicitly remove focus outline in Chromium when it shouldn't be
+// visible (e.g. as result of mouse click or touch tap). It already
+// should be doing this automatically, but seems to currently be
+// confused and applies its very visible two-tone outline anyway.
+
+button:focus:not(:focus-visible) {
+  outline: 0;
+}
+
 // 1. Remove the margin in Firefox and Safari
 
 input,