Merge branch 'dev' into docs-vercel

tmorehouse · web-flow · commit 144c4f0b92d4 · 2020-04-26T04:28:07.000-03:00
diff --git a/docs/components/componentdoc.vue b/docs/components/componentdoc.vue
@@ -11,6 +11,7 @@
           variant="secondary"
           target="_blank"
           href="https://vuejs.org/v2/guide/render-function.html#Functional-Components"
+          class="mb-3 mb-sm-0"
         >
           Functional component
         </b-badge>
diff --git a/docs/constants.js b/docs/constants.js
@@ -13,3 +13,6 @@ export const GWT_JS_ORG = 'H9Mn7ie5Z5KJSjRfsn9nilLn5kFgn7BMEqL_sUhVpzg'
 // *.bootstrap-vue.org
 // <meta name="google-site-verification" content="5E0vyG9CXTfY7McIt2aQppkNA6FQ3b0JJRZzhQ16HW4" />
 export const GWT_BV_ORG = '5E0vyG9CXTfY7McIt2aQppkNA6FQ3b0JJRZzhQ16HW4'
+// bootstrap-vue.netlify.app (legacy dev site)
+// <meta name="google-site-verification" content="Ba1MOy9bRa-r-8eLhSTEkayGbGrT3HhbNuqNiY60uzo" />
+export const GWT_BV_NETLIFY = 'Ba1MOy9bRa-r-8eLhSTEkayGbGrT3HhbNuqNiY60uzo'
diff --git a/docs/layouts/default.js b/docs/layouts/default.js
@@ -1,4 +1,4 @@
-import { BASE_URL, GWT_BV_ORG, GWT_JS_ORG } from '~/constants'
+import { BASE_URL, GWT_BV_ORG, GWT_JS_ORG, GWT_BV_NETLIFY } from '~/constants'
 import Footer from '~/components/footer'
 import Header from '~/components/header'
 
@@ -25,11 +25,17 @@ export default {
           name: 'google-site-verification',
           content: GWT_BV_ORG
         },
-        // Add GWT site verification for bootstrap-vue.js.org
+        // Add GWT site verification for bootstrap-vue.js.org (legacy)
         {
           hid: 'google-site-verification-js-org',
           name: 'google-site-verification',
           content: GWT_JS_ORG
+        },
+        // Add GWT site verification for bootstrap-vue.netlify.app (legacy)
+        {
+          hid: 'google-site-verification-netlify',
+          name: 'google-site-verification',
+          content: GWT_BV_NETLIFY
         }
       ]
     }
diff --git a/now.json b/now.json
@@ -0,0 +1,13 @@
+{
+  "headers": [
+    {
+      "source": "/(.*)",
+      "headers" : [
+        {
+          "key" : "X-Robots-Tag",
+          "value" : ""
+        }
+      ]
+    }
+  ]
+}
diff --git a/package.json b/package.json
@@ -142,7 +142,7 @@
     "loader-utils": "^2.0.0",
     "lodash": "^4.17.15",
     "marked": "^1.0.0",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.0",
     "nuxt": "^2.12.2",
     "postcss-cli": "^7.1.0",
     "prettier": "1.14.3",
diff --git a/src/_custom-controls.scss b/src/_custom-controls.scss
@@ -32,11 +32,19 @@
 // Shared BVFormBtnLabelControl styling
 // Currently used by BFormTimepicker and BFormDatepicker
 // Does not apply to button-only styling
-.b-form-btn-label-control {
-  // Remove background validation images from main wrapper
+.b-form-btn-label-control.form-control {
+  // Remove background validation images and padding from
+  // main wrapper as they will be present in the inner label element
   background-image: none;
   padding: 0;
 
+  @at-root {
+    // Handle input-group padding overrides
+    .input-group & {
+      padding: 0;
+    }
+  }
+
   @at-root {
     // Prevent the button/label from reversing order on in horizontal RTL mode
     [dir="rtl"] &,
@@ -77,6 +85,7 @@
     padding-left: 0.25rem;
     margin: 0;
     border: 0;
+    font-size: inherit;
     @if $enable-pointer-cursor-for-buttons {
       cursor: pointer;
     }
@@ -92,6 +101,21 @@
     &.form-control-lg {
       min-height: calc(#{$input-height-lg} - #{$input-height-border});
     }
+
+    @at-root {
+      // Handle input group sizing
+      .input-group.input-group-sm & {
+        min-height: calc(#{$input-height-sm} - #{$input-height-border});
+        padding-top: $input-padding-y-sm;
+        padding-bottom: $input-padding-y-sm
+      }
+
+      .input-group.input-group-lg & {
+        min-height: calc(#{$input-height-lg} - #{$input-height-border});
+        padding-top: $input-padding-y-lg;
+        padding-bottom: $input-padding-y-lg
+      }
+    }
   }
 
   // Disabled and read-only styling
diff --git a/src/components/form/README.md b/src/components/form/README.md
@@ -187,11 +187,12 @@ See also:
 - [`<b-form-select>`](/docs/components/form-select) Select input
 - [`<b-form-radio>`](/docs/components/form-radio) Radio Inputs
 - [`<b-form-checkbox>`](/docs/components/form-checkbox) Checkbox Inputs
-- [`b-form-datepicker`](/docs/components/form-datepicker) Date picker input
-- [`b-form-spinbutton`](/docs/components/form-spinbutton) Numerical range spinbutton input
-- [`b-form-tags`](/docs/components/form-tags) Customizable tag input
-- [`<b-form-timepicker>`](/docs/components/form-timepicker) Time picker custom form input
 - [`<b-form-file>`](/docs/components/form-file) File Input
+- [`<b-form-datepicker>`](/docs/components/form-datepicker) Date picker input
+- [`<b-form-spinbutton>`](/docs/components/form-spinbutton) Numerical range spinbutton input
+- [`<b-form-tags>`](/docs/components/form-tags) Customizable tag input
+- [`<b-form-timepicker>`](/docs/components/form-timepicker) Time picker custom form input
+- [`<b-form-rating>`](/docs/components/form-rating) Star rating custom form input and display
 - [`<b-button>`](/docs/components/button) Buttons
 - [`<b-form-group>`](/docs/components/form-group) Form input wrapper to generate form-groups that
   support labels, help text and feedback
diff --git a/src/components/input-group/README.md b/src/components/input-group/README.md
@@ -113,17 +113,24 @@ subcomponent inside of the `<b-input-group-prepend>` or `<b-input-group-append>`
 
 The following are the form controls supported as the input-group's _main_ input element:
 
-- `<b-form-input>`
-- `<b-form-textarea>`
-- `<b-form-select>`
-- `<b-form-file>`
+- [`<b-form-input>`](/docs/components/form-input)
+- [`<b-form-textarea>`](/docs/components/form-textarea)
+- [`<b-form-select>`](/docs/components/form-select)
+- [`<b-form-file>`](/docs/components/form-file)
+- [`<b-form-rating>`](/docs/components/form-rating)
+- [`<b-form-tags>`](/docs/components/form-tags)
+- [`<b-form-spinbutton>`](/docs/components/form-splinbutton)
+- [`<b-form-datepicker>`](/docs/components/form-datepicker)
+- [`<b-form-timepicker>`](/docs/components/form-timepicker)
 
 **Notes:**
 
 - BootstrapVue uses custom SCSS/CSS to handling sizing the `<b-form-file>` input when it is placed
   in a `<b-input-group>` which has a [`size`](#control-sizing) specified.
 - BootstrapVue uses custom SCSS/CSS when `<b-form-input type="range">` is placed in a
   `<b-input-group>`.
+- BootstrapVue's custom components (i.e. `<b-form-spinbutton>`, `<b-form-rating>`, `<b-form-tags>`,
+  etc.) require BootstrapVue's custom SCSS/CSS.
 
 ## Checkbox and radio addons
 
diff --git a/src/components/media/README.md b/src/components/media/README.md
@@ -65,7 +65,7 @@
   <b-card>
     <b-media no-body>
       <b-media-aside vertical-align="center">
-        <b-img blank blank-color="#ccc" width="128" height="256" alt="placeholder"></b-img>
+        <b-img blank blank-color="#ccc" width="64" height="128" alt="placeholder"></b-img>
       </b-media-aside>
 
       <b-media-body class="ml-3">
diff --git a/src/components/table/package.json b/src/components/table/package.json
@@ -143,7 +143,7 @@
           {
             "prop": "detailsTdClass",
             "version": "2.1.0",
-            "description": "CSS class (or classes) to apply to the td element in the details row"
+            "description": "CSS class (or classes) to apply to the row details' `td` element for the row-details slot"
           },
           {
             "prop": "value",
diff --git a/src/utils/date.js b/src/utils/date.js
@@ -6,7 +6,12 @@ import { toInteger } from './number'
 
 // --- Constants ---
 
-const RX_DATE = /^\d+-\d+-\d+$/
+// Loose YYYY-MM-DD matching, ignores any appended time inforation
+// Matches '1999-12-20', '1999-1-1', '1999-01-20T22:51:49.118Z', '1999-01-02 13:00:00'
+const RX_DATE = /^\d+-\d\d?-\d\d?(?:\s|T|$)/
+
+// Used to split off the date parts of the YYYY-MM-DD string
+const RX_DATE_SPLIT = /-|\s|T/
 
 // --- Date utility methods ---
 
@@ -16,7 +21,7 @@ export const createDate = (...args) => new Date(...args)
 // Parse a date sting, or Date object, into a Date object (with no time information)
 export const parseYMD = date => {
   if (isString(date) && RX_DATE.test(date.trim())) {
-    const [year, month, day] = date.split('-').map(toInteger)
+    const [year, month, day] = date.split(RX_DATE_SPLIT).map(v => toInteger(v, 1))
     return createDate(year, month - 1, day)
   } else if (isDate(date)) {
     return createDate(date.getFullYear(), date.getMonth(), date.getDate())
diff --git a/src/utils/date.spec.js b/src/utils/date.spec.js
@@ -17,9 +17,14 @@ describe('utils/date', () => {
   it('parseYMD works', async () => {
     const date1 = parseYMD('2020-01-15')
     const date2 = new Date(2020, 0, 15)
+    const date3 = parseYMD('2020-01-15T23:16:56.131Z')
+    const date4 = parseYMD('2020-01-15 23:16:56')
 
     expect(date1.toISOString()).toEqual(date2.toISOString())
+    expect(date1.toISOString()).toEqual(date3.toISOString())
+    expect(date1.toISOString()).toEqual(date4.toISOString())
     expect(parseYMD('yyyy-mm-dd')).toEqual(null)
+    expect(parseYMD('2020-01-15XYZ')).toEqual(null)
   })
 
   it('formatYMD works', async () => {
@@ -28,6 +33,9 @@ describe('utils/date', () => {
     expect(formatYMD('2020-01-32')).toEqual('2020-02-01')
     expect(formatYMD('adsadsad')).toEqual(null)
     expect(formatYMD('x2020-01-15')).toEqual(null)
+    expect(formatYMD('2020-01-15x')).toEqual(null)
+    expect(formatYMD('2020-01-15T23:16:56.131Z')).toEqual('2020-01-15')
+    expect(formatYMD('2020-01-15 23:16:56')).toEqual('2020-01-15')
   })
 
   it('datesEqual works', async () => {
diff --git a/yarn.lock b/yarn.lock
@@ -8883,10 +8883,10 @@ node-res@^5.0.1:
     on-finished "^2.3.0"
     vary "^1.1.2"
 
-node-sass@^4.13.1:
-  version "4.13.1"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3"
-  integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw==
+node-sass@^4.14.0:
+  version "4.14.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.0.tgz#a8e9d7720f8e15b4a1072719dcf04006f5648eeb"
+  integrity sha512-AxqU+DFpk0lEz95sI6jO0hU0Rwyw7BXVEv6o9OItoXLyeygPeaSpiV4rwQb10JiTghHaa0gZeD21sz+OsQluaw==
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`variant="secondary"`
`12`	`12`	`target="_blank"`
`13`	`13`	`href="https://vuejs.org/v2/guide/render-function.html#Functional-Components"`
	`14`	`+ class="mb-3 mb-sm-0"`
`14`	`15`	`>`
`15`	`16`	`Functional component`
`16`	`17`	`</b-badge>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { BASE_URL, GWT_BV_ORG, GWT_JS_ORG } from '~/constants'`
	`1`	`+import { BASE_URL, GWT_BV_ORG, GWT_JS_ORG, GWT_BV_NETLIFY } from '~/constants'`
`2`	`2`	`import Footer from '~/components/footer'`
`3`	`3`	`import Header from '~/components/header'`
`4`	`4`
`@@ -25,11 +25,17 @@ export default {`
`25`	`25`	`name: 'google-site-verification',`
`26`	`26`	`content: GWT_BV_ORG`
`27`	`27`	`},`
`28`		`- // Add GWT site verification for bootstrap-vue.js.org`
	`28`	`+ // Add GWT site verification for bootstrap-vue.js.org (legacy)`
`29`	`29`	`{`
`30`	`30`	`hid: 'google-site-verification-js-org',`
`31`	`31`	`name: 'google-site-verification',`
`32`	`32`	`content: GWT_JS_ORG`
	`33`	`+ },`
	`34`	`+ // Add GWT site verification for bootstrap-vue.netlify.app (legacy)`
	`35`	`+ {`
	`36`	`+ hid: 'google-site-verification-netlify',`
	`37`	`+ name: 'google-site-verification',`
	`38`	`+ content: GWT_BV_NETLIFY`
`33`	`39`	`}`
`34`	`40`	`]`
`35`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@`
`143`	`143`	`{`
`144`	`144`	`"prop": "detailsTdClass",`
`145`	`145`	`"version": "2.1.0",`
`146`		`- "description": "CSS class (or classes) to apply to the td element in the details row"`
	`146`	+ "description": "CSS class (or classes) to apply to the row details' `td` element for the row-details slot"
`147`	`147`	`},`
`148`	`148`	`{`
`149`	`149`	`"prop": "value",`