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.

Sign up for GitHub

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

Jump to bottom

feat: add style to work with v-calendar time picker (#243) #265

Merged
merged 4 commits into from
Jan 11, 2024
Merged

feat: add style to work with v-calendar time picker (#243) #265

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
38f4239
feat: add style to work with v-calendar time picker (#243)
Jan 11, 2024
c6fe91c
docs: add datetime picker to doc + build registery
Jan 11, 2024
29b5abf
build: build registery in apps/www
Jan 11, 2024
b7bb0d1
chore: tweaks and fix darkmode selectbox bg
sadeghbarati Jan 11, 2024
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
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/default/example/DateTimePickerDemo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const date = ref<Date>()
)"
>
<CalendarIcon class="mr-2 h-4 w-4" />
<span>{{ date ? format(date, "PPP") : "Pick a date" }}</span>
<span>{{ date ? format(date, 'PPP - hh:mm') : "Pick a date" }}</span>
</Button>
</PopoverTrigger>
<PopoverContent class="w-auto p-0">
Expand Down
4 changes: 2 additions & 2 deletions apps/www/src/lib/registry/default/ui/calendar/Calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ onMounted(async () => {
@apply pointer-events-none opacity-50;
}
.vc-time-picker.vc-attached {
@apply border-t border-solid border-secondary;
@apply border-t border-solid border-secondary mt-2;
}
.vc-time-picker > * + * {
@apply mt-1;
Expand All @@ -261,7 +261,7 @@ onMounted(async () => {
@apply mr-1 text-primary stroke-primary;
}
.vc-time-select-group select {
@apply bg-transparent p-1 appearance-none outline-none text-center;
@apply bg-primary-foreground p-1 appearance-none outline-none text-center;
}
.vc-time-weekday {
@apply text-muted-foreground tracking-wide;
Expand Down
2 changes: 1 addition & 1 deletion apps/www/src/lib/registry/new-york/example/DateTimePickerDemo.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const date = ref<Date>()
)"
>
<CalendarIcon class="mr-2 h-4 w-4" />
<span>{{ date ? format(date, "PPP") : "Pick a date" }}</span>
<span>{{ date ? format(date, 'PPP - hh:mm') : "Pick a date" }}</span>
</Button>
</PopoverTrigger>
<PopoverContent class="w-auto p-0">
Expand Down
4 changes: 2 additions & 2 deletions apps/www/src/lib/registry/new-york/ui/calendar/Calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ onMounted(async () => {
@apply pointer-events-none opacity-50;
}
.vc-time-picker.vc-attached {
@apply border-t border-solid border-secondary;
@apply border-t border-solid border-secondary mt-2;
}
.vc-time-picker > * + * {
@apply mt-1;
Expand All @@ -267,7 +267,7 @@ onMounted(async () => {
@apply mr-1 text-primary stroke-primary;
}
.vc-time-select-group select {
@apply bg-transparent p-1 appearance-none outline-none text-center;
@apply bg-primary-foreground p-1 appearance-none outline-none text-center;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sadeghbarati The problem is that by doing bg-primary-foreground instead of transparent, it broke the edges:
CleanShot 2024-01-12 at 17 40 07@2x

}
.vc-time-weekday {
@apply text-muted-foreground tracking-wide;
Expand Down
Loading
Loading