Skip to content

Commit 0e63ecb

Browse files
committed
improve timetracker on mobile; fix select all checkbox with 0 time
entries; add minimal padding to mobile dialogs
1 parent 6f207a4 commit 0e63ecb

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

resources/js/Components/ui/dialog/DialogContent.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ const forwarded = useForwardPropsEmits(delegatedProps, emits);
3131
<div
3232
:class="
3333
cn(
34-
'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start pt-6 md:pt-20 xl:pt-32 justify-center overflow-auto'
34+
'fixed top-0 left-0 z-50 pointer-events-none w-screen h-screen flex items-start px-2 pt-3 md:pt-20 xl:pt-32 justify-center overflow-auto'
3535
)
3636
">
3737
<DialogContent
3838
v-bind="forwarded"
3939
:class="
4040
cn(
41-
'pointer-events-auto bg-default-background grid w-full max-w-lg border border-border-tertiary shadow-lg duration-200 sm:rounded-lg outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
41+
'pointer-events-auto bg-default-background grid w-full max-w-lg border border-border-tertiary shadow-lg duration-200 rounded-lg outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95',
4242
props.class
4343
)
4444
">

resources/js/packages/ui/src/TimeEntry/TimeEntryMassActionRow.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const showMassUpdateModal = ref(false);
6969
">
7070
<Checkbox
7171
id="selectAll"
72-
:checked="allSelected"
72+
:checked="allSelected && selectedTimeEntries.length > 0"
7373
@update:checked="allSelected ? emit('unselectAll') : emit('selectAll')">
7474
</Checkbox>
7575
<FieldLabel

resources/js/packages/ui/src/TimeTracker/TimeTrackerControls.vue

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,17 +208,22 @@ useSelectEvents(
208208
<div class="flex items-center relative @container" data-testid="dashboard_timer">
209209
<div
210210
class="flex flex-col @2xl:flex-row w-full justify-between rounded-lg bg-card-background border-card-border border transition shadow-card">
211-
<div class="flex flex-1 items-center pr-6 relative">
211+
<div class="flex flex-1 items-center relative">
212212
<input
213213
ref="currentTimeEntryDescriptionInput"
214214
v-model="tempDescription"
215215
placeholder="What are you working on?"
216216
data-testid="time_entry_description"
217-
class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-base @4xl:text-lg text-text-primary bg-transparent border-none placeholder-text-secondary font-medium focus:ring-0 transition"
217+
class="w-full rounded-l-lg py-4 sm:py-2.5 px-3.5 border-b border-b-card-background-separator @2xl:px-4 text-lg text-text-primary bg-transparent border-none placeholder-text-secondary font-medium focus:ring-0 transition"
218218
type="text"
219219
@keydown.enter="startTimerIfNotActive"
220220
@keydown.esc="showDropdown = false"
221221
@blur="updateTimeEntryDescription" />
222+
<div class="@2xl:hidden pr-3 shrink-0">
223+
<TimeTrackerStartStop
224+
:active="isActive"
225+
@changed="onToggleButtonPress"></TimeTrackerStartStop>
226+
</div>
222227
<div
223228
v-if="showDropdown && filteredRecentlyTrackedTimeEntries.length > 0"
224229
ref="floating"
@@ -285,7 +290,7 @@ useSelectEvents(
285290
</div>
286291
</div>
287292
</div>
288-
<div class="pl-4 @2xl:pl-6 pr-3 absolute sm:relative top-[6px] sm:top-0 right-0">
293+
<div class="pl-4 @2xl:pl-6 pr-3 hidden @2xl:block">
289294
<TimeTrackerStartStop
290295
:active="isActive"
291296
size="large"

0 commit comments

Comments
 (0)