Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: minor adjustments to release 3.2.7 #540

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/vue/src/components/NavMobile/NavMobile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,9 @@ export default defineComponent({
// styles for default vs transparent header
// underline color and logo inversion styles handled within their respective components
&.-scrolled {
@apply fixed;
@media not print {
@apply fixed;
}
}
}
// vue-transition classes
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ export const MultiDayEvent = {
...PageEduEventDetailData,
startDate: '2024-08-08',
endDate: '2024-08-12',
startDatetime: '2024-08-08T14:00:00-07:00',
startDatetime: '2024-08-08T11:00:00-07:00',
startTime: '15:00:00',
endDatetime: '2024-08-12T22:00:00-07:00'
}
Expand Down
2 changes: 1 addition & 1 deletion packages/vue/src/utils/mixins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ export const mixinFormatEventTimeInHoursAndMinutes = (
// Event is less than 24 hours and spans 1 day
if (endTime) {
if (startDateDayjs.format('a') === endDateDayjs.format('a')) {
time = `${startDateDayjs.format('h:mm')} - ${endDateDayjs.format('h:mm a z')}`
time = `${startDateDayjs.format('h:mm')}-${endDateDayjs.format('h:mm a z')}`
} else {
time = `${startDateDayjs.format('h:mm a')} - ${endDateDayjs.format('h:mm a z')}`
}
Expand Down
Loading