Merge branch 'main' into qa/teachable-moments

nasa-jpl · Aug 28, 2024 · aafe069 · aafe069
2 parents 1d3e671 + 268308d
commit aafe069
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 16 deletions.
diff --git a/packages/vue/src/components/BaseAccordionItem/BaseAccordionItem.vue b/packages/vue/src/components/BaseAccordionItem/BaseAccordionItem.vue
@@ -61,7 +61,7 @@ const emit = defineEmits(['accordionItemOpened', 'accordionItemClosed'])
         >
           <component
             :is="headingLevel"
-            class="!font-medium"
+            class="!font-normal !tracking-normal"
           >
             <button
               v-bind-once="{ id: headingId, 'aria-controls': panelId }"

diff --git a/packages/vue/src/components/BlockCardGrid/BlockCardGrid.vue b/packages/vue/src/components/BlockCardGrid/BlockCardGrid.vue
@@ -18,7 +18,7 @@
       />
     </div>
     <MixinCarousel
-      class="md:hidden sm:-ml-10 py-14 lg:py-10 -mt-10 overflow-x-hidden"
+      class="md:hidden py-14 lg:py-10 -mt-10 overflow-x-hidden"
       indent="col-1"
       :slides-per-view="3"
       no-links

diff --git a/packages/vue/src/components/BlockLinkCard/BlockLinkCard.vue b/packages/vue/src/components/BlockLinkCard/BlockLinkCard.vue
@@ -271,7 +271,7 @@ export default defineComponent({
       } else if (this.medium) {
         classes = 'can-hover:group-hover:-translate-y-3 edu:can-hover:group-hover:-translate-y-2'
       } else if (this.large) {
-        classes = 'sm:pl-8 sm:w-2/3'
+        classes = 'sm:pl-8 sm:w-2/3 lg:pt-2'
       }
       return classes
     },

diff --git a/packages/vue/src/components/BlockStreamfield/BlockStreamfield.vue b/packages/vue/src/components/BlockStreamfield/BlockStreamfield.vue
@@ -202,9 +202,11 @@
       <div
         v-else-if="block.blockType == 'ListBlock' && block.field === 'card_grid'"
         :key="`cardGridBlock${index}`"
-        class="lg:mb-18 mb-10"
+        class="LayoutHelper md:BaseGrid md:container md:mx-auto lg:mb-18 mb-10"
       >
-        <BlockCardGrid :cards="block.items" />
+        <div class="lg:col-start-2 lg:col-end-12 md:col-span-full md:px-4 px-0 relative">
+          <BlockCardGrid :cards="block.items" />
+        </div>
       </div>
 
       <div
@@ -218,7 +220,7 @@
       <LayoutHelper
         v-else-if="block.blockType === 'LinkCardListBlock' && block.blocks?.length"
         :key="`linkCardListBlock${index}`"
-        indent="col-3"
+        indent="col-2"
         class="lg:mb-18 mb-10"
       >
         <BlockLinkCardList :items="block.blocks" />

diff --git a/packages/vue/src/components/CalendarButton/CalendarButton.vue b/packages/vue/src/components/CalendarButton/CalendarButton.vue
@@ -80,11 +80,10 @@ export default defineComponent({
     init() {
       let recurrence = undefined
       if ((this.isAllDay && this.endDatetime) || (this.startDate && this.endDatetime)) {
-        console.log('initing')
         // Calculate how many full days
         const startDateDayjs = this.startDatetime
           ? dayjs(this.startDatetime)
-          : dayjs(this.startDate)
+          : dayjs(this.startDate).tz('America/Los_Angeles')
         const endDateDayjs = dayjs(this.endDatetime)
         const difference = endDateDayjs.diff(startDateDayjs, 'day') + 1
         recurrence = { frequency: 'DAILY', interval: 1, count: difference }
@@ -95,9 +94,11 @@ export default defineComponent({
         location: this.location ? this.location : undefined,
         description: this.icsDescription,
         start: this.startDatetime
-          ? new Date(this.startDatetime)
+          ? // @ts-ignore
+            new Date(dayjs(this.startDatetime))
           : this.startDate
-            ? new Date(this.startDate)
+            ? // @ts-ignore
+              new Date(dayjs(this.startDate).tz('America/Los_Angeles'))
             : new Date(),
         end: !this.isAllDay && this.endDatetime ? new Date(this.endDatetime) : undefined,
         recurrence

diff --git a/packages/vue/src/components/MetadataEduResource/MetadataEduResource.vue b/packages/vue/src/components/MetadataEduResource/MetadataEduResource.vue
@@ -61,7 +61,7 @@ const time = computed(() => {
       <span>{{ audience }}</span>
     </div>
     <div
-      v-if="time"
+      v-if="time && !compact"
       class="MetadataEduResourceItem"
     >
       <IconTime

diff --git a/packages/vue/src/components/MetadataEvent/MetadataEvent.stories.js b/packages/vue/src/components/MetadataEvent/MetadataEvent.stories.js
@@ -12,12 +12,14 @@ export const MetadataEventData = {
   event: {
     title: 'Event title',
     location: 'Location',
-    startDate: '2021-11-11',
-    startDatetime: '2021-11-11T00:00:00-08:00',
-    endDate: '2021-11-11',
+    startDate: '2024-08-08',
+    startDatetime: '2024-08-08T14:00:00-07:00',
+    startTime: '15:00:00',
+    endDate: '2024-08-08',
+    endDatetime: '2024-08-08T22:00:00-07:00',
+    endTime: '22:00:00',
     ongoing: false,
     isVirtualEvent: false,
-    endDatetime: '2021-11-11T23:59:59.999999-08:00',
     locationName: 'Webcast',
     locationLink: 'https://www.nasa.gov',
     customDate: undefined

diff --git a/packages/vue/src/templates/www/PageRoboticsDetail/PageRoboticsDetail.vue b/packages/vue/src/templates/www/PageRoboticsDetail/PageRoboticsDetail.vue
@@ -38,7 +38,7 @@
       <!-- facts -->
       <BlockCardGrid
         v-if="data.facts"
-        class="3xl:col-end-13 xl:col-end-11 md:px-4 lg:px-0 relative col-start-2 col-end-13 px-0 mt-12"
+        class="3xl:col-end-13 xl:col-end-11 md:px-4 lg:px-0 relative sm:col-start-2 sm:col-end-13 px-0 mt-12"
         :cards="data.facts"
       />
     </div>

diff --git a/packages/vue/src/utils/dayjs.js b/packages/vue/src/utils/dayjs.js
@@ -2,6 +2,7 @@ import dayjs from 'dayjs'
 import updateLocale from 'dayjs/plugin/updateLocale.js'
 import localizedFormat from 'dayjs/plugin/localizedFormat.js'
 import timezone from 'dayjs/plugin/timezone.js'
+import utc from 'dayjs/plugin/utc.js'
 import advancedFormat from 'dayjs/plugin/advancedFormat.js'
 import duration from 'dayjs/plugin/duration.js'
 import minMax from 'dayjs/plugin/minMax.js'
@@ -10,6 +11,7 @@ import minMax from 'dayjs/plugin/minMax.js'
 import 'dayjs/locale/en-gb.js'
 
 dayjs.extend(timezone)
+dayjs.extend(utc)
 dayjs.extend(advancedFormat)
 dayjs.extend(localizedFormat)
 dayjs.extend(updateLocale)