Skip to content

[6.x] Date time field borders #13360

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

Merged
jasonvarga merged 2 commits into from
Dec 18, 2025
+32 −32
Merged

[6.x] Date time field borders #13360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b581403
Make indentation consistent
JayGeorge Dec 17, 2025
30d35d1
Make date and time field borders consistent with other fieldtypes
JayGeorge Dec 17, 2025
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
60 changes: 30 additions & 30 deletions resources/js/components/ui/DatePicker/DatePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,14 @@ const calendarBindings = computed(() => ({
}));

const inputEvents = computed(() => ({
focusout: (event) => {
if (props.modelValue?.year.toString().length === 2) {
let value = props.modelValue;
value.year = '20' + value.year;
focusout: (event) => {
if (props.modelValue?.year.toString().length === 2) {
let value = props.modelValue;
value.year = '20' + value.year;

emit('update:modelValue', value);
}
},
emit('update:modelValue', value);
}
},
}));

const calendarEvents = computed(() => ({
Expand Down Expand Up @@ -135,7 +135,7 @@ const getInputLabel = (part) => {
<div
:class="[
'flex w-full items-center bg-white uppercase dark:bg-gray-900',
'border border-gray-300 dark:border-x-0 dark:border-t-0 dark:border-white/10 dark:inset-shadow-2xs dark:inset-shadow-black',
'border border-gray-300 dark:border-gray-700',
'text-gray-600 dark:text-gray-300',
'shadow-ui-sm not-prose h-10 rounded-lg px-2 disabled:shadow-none',
'data-invalid:border-red-500',
Expand All @@ -155,28 +155,28 @@ const getInputLabel = (part) => {
</DatePickerTrigger>
<div class="flex items-center flex-1">
<template v-for="item in segments" :key="item.part">
<div v-if="item.part === 'literal'">
<DatePickerInput
:part="item.part"
:class="{ 'text-sm text-gray-600 dark:text-gray-400 antialiased': !item.contenteditable }"
v-on="inputEvents"
>
{{ item.value }}
</DatePickerInput>
</div>
<div v-else>
<DatePickerInput
:part="item.part"
class="rounded-sm px-0.25 py-0.5 focus:bg-blue-100 focus:outline-hidden data-placeholder:text-gray-600 dark:focus:bg-blue-900 dark:data-placeholder:text-gray-400"
:class="{
'px-0.5!': item.part === 'month' || item.part === 'year' || item.part === 'day',
}"
:aria-label="getInputLabel(item.part)"
v-on="inputEvents"
>
{{ item.value }}
</DatePickerInput>
</div>
<div v-if="item.part === 'literal'">
<DatePickerInput
:part="item.part"
:class="{ 'text-sm text-gray-600 dark:text-gray-400 antialiased': !item.contenteditable }"
v-on="inputEvents"
>
{{ item.value }}
</DatePickerInput>
</div>
<div v-else>
<DatePickerInput
:part="item.part"
class="rounded-sm px-0.25 py-0.5 focus:bg-blue-100 focus:outline-hidden data-placeholder:text-gray-600 dark:focus:bg-blue-900 dark:data-placeholder:text-gray-400"
:class="{
'px-0.5!': item.part === 'month' || item.part === 'year' || item.part === 'day',
}"
:aria-label="getInputLabel(item.part)"
v-on="inputEvents"
>
{{ item.value }}
</DatePickerInput>
</div>
</template>
</div>
<Button
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/ui/DateRangePicker/DateRangePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ const calendarEvents = computed(() => ({
<div
:class="[
'flex items-center w-full bg-white dark:bg-gray-900',
'border border-gray-300 dark:border-x-0 dark:border-t-0 dark:border-white/10 dark:inset-shadow-2xs dark:inset-shadow-black',
'border border-gray-300 dark:border-gray-700',
'leading-[1.375rem] text-gray-600 dark:text-gray-300',
'shadow-ui-sm not-prose h-10 rounded-lg py-2 px-2.5 disabled:shadow-none',
'data-invalid:border-red-500',
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/ui/TimePicker/TimePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const setToNow = () => {
:granularity="granularity"
:class="[
'flex items-center w-full bg-white dark:bg-gray-900',
'border border-gray-300 dark:border-x-0 dark:border-t-0 dark:border-white/10 dark:inset-shadow-2xs dark:inset-shadow-black',
'border border-gray-300 dark:border-gray-700',
'leading-5 text-gray-600 dark:text-gray-300',
'shadow-ui-sm not-prose h-10 rounded-lg py-2 px-3 disabled:shadow-none',
'data-invalid:border-red-500',
Expand Down