Merge branch 'dev' into dev

xanf · web-flow · commit 0849c38dd464 · 2021-12-15T16:58:38.000+02:00
diff --git a/docs/markdown/intro/README.md b/docs/markdown/intro/README.md
@@ -132,7 +132,7 @@ Then, register BootstrapVue in your app entry point (typically `app.js` or `main
 import Vue from 'vue'
 import { BootstrapVue, IconsPlugin } from 'bootstrap-vue'
 
-// Import Bootstrap an BootstrapVue CSS files (order is important)
+// Import Bootstrap and BootstrapVue CSS files (order is important)
 import 'bootstrap/dist/css/bootstrap.css'
 import 'bootstrap-vue/dist/bootstrap-vue.css'
 
diff --git a/src/components/toast/README.md b/src/components/toast/README.md
@@ -633,9 +633,9 @@ provides general guidelines when using toasts.
 - Avoid initiating many toasts in quick succession, as screen readers may interrupt reading the
   current toast and announce the new toast, causing the context of the previous toast to be missed.
 - For toasts with long textual content, adjust the `auto-hide-delay` to a larger timeout, to allow
-  users time to read the content of the toast. A good length of time to keep messages up is 4
-  seconds plus 1 extra second for every 100 words, rounding up. This is approximately how fast the
-  average person reads. That means the shortest default that should be used as a best practice is 5
+  users time to read the content of the toast. The average person reads about 200 words per minute,
+  so a good length of time to keep messages up is 5 seconds, plus 300 extra milliseconds per word.
+  The shortest default that should be used as a best practice is 5
   seconds (5000ms). In addition to a reasonable default timeout, you could also allow the user to
   choose how long they want toasts to stay up for. Most people inherently understand whether they
   are fast or slow readers. Having a profile setting that is part of the user login will allow slow
diff --git a/src/icons/helpers/make-icon.js b/src/icons/helpers/make-icon.js
@@ -3,6 +3,8 @@ import { omit } from '../../utils/object'
 import { kebabCase, pascalCase, trim } from '../../utils/string'
 import { BVIconBase, props as BVIconBaseProps } from './icon-base'
 
+const iconProps = omit(BVIconBaseProps, ['content'])
+
 /**
  * Icon component generator function
  *
@@ -22,7 +24,7 @@ export const makeIcon = (name, content) => {
   return /*#__PURE__*/ Vue.extend({
     name: iconName,
     functional: true,
-    props: omit(BVIconBaseProps, ['content']),
+    props: iconProps,
     render(h, { data, props }) {
       return h(
         BVIconBase,
