Skip to content

Commit 1cf33dd

Browse files
OnatcerOnatcer
committed
improve dark mode color palette; rework font weights throughout the
interface
1 parent 84cd0d5 commit 1cf33dd

18 files changed

+74
-73
lines changed

‎resources/js/Components/Common/Client/ClientTableRow.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,11 @@ const showEditModal = ref(false);
5757
</span>
5858
</div>
5959
<div
60-
class="whitespace-nowrap flex items-center px-3 py-4 text-sm font-medium text-text-primary">
61-
<span class="text-text-secondary"> {{ projectCount }} Projects </span>
60+
class="whitespace-nowrap flex items-center px-3 py-4 text-sm text-text-primary">
61+
<span> {{ projectCount }} Projects </span>
6262
</div>
6363
<div
64-
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
64+
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center">
6565
<template v-if="client.is_archived">
6666
<ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
6767
<span>Archived</span>

‎resources/js/Components/Common/Member/MemberTableRow.vue‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -83,27 +83,28 @@ const userHasValidMailAddress = computed(() => {
8383
{{ member.name }}
8484
</span>
8585
</div>
86-
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
86+
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
8787
{{ member.email }}
8888
</div>
89-
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
89+
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
9090
{{ capitalizeFirstLetter(member.role) }}
9191
</div>
92-
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
93-
{{
94-
member.billable_rate
95-
? formatCents(
96-
member.billable_rate,
97-
organization?.currency,
98-
organization?.currency_format,
99-
organization?.currency_symbol,
100-
organization?.number_format
101-
)
102-
: '--'
103-
}}
92+
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
93+
<span v-if="member.billable_rate">
94+
{{
95+
formatCents(
96+
member.billable_rate,
97+
organization?.currency,
98+
organization?.currency_format,
99+
organization?.currency_symbol,
100+
organization?.number_format
101+
)
102+
}}
103+
</span>
104+
<span v-else class="text-text-tertiary"> -- </span>
104105
</div>
105106
<div
106-
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
107+
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center">
107108
<template v-if="member.is_placeholder === false">
108109
<CheckCircleIcon class="w-4 text-icon-default"></CheckCircleIcon>
109110
<span>Active</span>

‎resources/js/Components/Common/Project/ProjectTableRow.vue‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const billableRateInfo = computed(() => {
7272
return 'Default Rate';
7373
}
7474
}
75-
return '--';
75+
return null;
7676
});
7777
7878
const showEditProjectModal = ref(false);
@@ -98,13 +98,13 @@ const showEditProjectModal = ref(false);
9898
</span>
9999
<span class="text-text-secondary"> {{ projectTasksCount }} Tasks </span>
100100
</div>
101-
<div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-secondary">
101+
<div class="whitespace-nowrap min-w-0 px-3 py-4 text-sm text-text-primary">
102102
<div v-if="project.client_id" class="overflow-ellipsis overflow-hidden">
103103
{{ client?.name }}
104104
</div>
105-
<div v-else>No client</div>
105+
<div v-else class="text-text-tertiary">No client</div>
106106
</div>
107-
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
107+
<div class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
108108
<div v-if="project.spent_time">
109109
{{
110110
formatHumanReadableDuration(
@@ -114,23 +114,24 @@ const showEditProjectModal = ref(false);
114114
)
115115
}}
116116
</div>
117-
<div v-else>--</div>
117+
<div v-else class="text-text-tertiary">--</div>
118118
</div>
119-
<div class="whitespace-nowrap px-3 flex items-center text-sm text-text-secondary">
119+
<div class="whitespace-nowrap px-3 flex items-center text-sm text-text-primary">
120120
<UpgradeBadge v-if="!isAllowedToPerformPremiumAction()"></UpgradeBadge>
121121
<EstimatedTimeProgress
122122
v-else-if="project.estimated_time"
123123
:estimated="project.estimated_time"
124124
:current="project.spent_time"></EstimatedTimeProgress>
125-
<span v-else> -- </span>
125+
<span v-else class="text-text-tertiary"> -- </span>
126126
</div>
127127
<div
128128
v-if="showBillableRate"
129-
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary">
130-
{{ billableRateInfo }}
129+
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary">
130+
<span v-if="billableRateInfo">{{ billableRateInfo }}</span>
131+
<span v-else class="text-text-tertiary">--</span>
131132
</div>
132133
<div
133-
class="whitespace-nowrap px-3 py-4 text-sm text-text-secondary flex space-x-1.5 items-center font-medium">
134+
class="whitespace-nowrap px-3 py-4 text-sm text-text-primary flex space-x-1.5 items-center font-medium">
134135
<template v-if="project.is_archived">
135136
<ArchiveBoxIcon class="w-4 text-icon-default"></ArchiveBoxIcon>
136137
<span>Archived</span>

‎resources/js/Components/Common/StatCard.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ defineProps<{
77

88
<template>
99
<div class="rounded-lg bg-card-background border-card-border shadow-card border px-3.5 py-2.5">
10-
<dt class="font-semibold text-sm text-text-secondary">{{ title }}</dt>
11-
<dd class="text-xl text-text-primary pt-1 font-semibold">
10+
<dt class="font-medium text-sm text-text-secondary">{{ title }}</dt>
11+
<dd class="text-xl text-text-primary pt-1 font-medium">
1212
{{ value ?? '--' }}
1313
</dd>
1414
</div>

‎resources/js/Components/Dashboard/DayOverviewCardEntry.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ defineProps<{
2323
<div class="items-center justify-center flex-1 hidden @2xs:flex">
2424
<DayOverviewCardChart :history="history"></DayOverviewCardChart>
2525
</div>
26-
<div class="flex text-sm items-center justify-center text-text-secondary min-w-[65px]">
26+
<div class="flex text-sm items-center justify-center text-text-primary min-w-[65px]">
2727
{{
2828
formatHumanReadableDuration(
2929
duration,

‎resources/js/Components/Dashboard/RecentlyTrackedTasksCardEntry.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ async function startTaskTimer() {
4747
<template>
4848
<div class="px-3.5 py-2 grid grid-cols-5">
4949
<div class="col-span-4">
50-
<p class="text-text-secondary text-sm pb-1.5 truncate">
50+
<p class="text-text-primary text-sm pb-1.5 truncate">
5151
<span v-if="timeEntry.description"> {{ timeEntry.description }}</span>
52-
<span v-else>No description</span>
52+
<span v-else class="text-text-secondary">No description</span>
5353
</p>
5454
<ProjectBadge size="base" class="min-w-0 max-w-full" :color="project?.color">
5555
<div class="flex items-center lg:space-x-0.5 min-w-0">

‎resources/js/Components/Dashboard/TeamActivityCard.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ const { data: latestTeamActivity, isLoading } = useQuery({
4848
class="text-center flex flex-1 justify-center items-center">
4949
<div>
5050
<UserGroupIcon class="w-8 text-icon-default inline pb-2"></UserGroupIcon>
51-
<h3 class="text-text-primary font-semibold text-sm">Invite your co-workers</h3>
51+
<h3 class="text-text-primary font-medium text-sm">Invite your co-workers</h3>
5252
<p class="pb-5 text-sm">You can invite your entire team.</p>
5353
<SecondaryButton @click="router.visit(route('members'))"
5454
>Go to Members

‎resources/js/Components/Dashboard/TeamActivityCardEntry.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ defineProps<{
1111
<div class="col-span-2">
1212
<div class="flex justify-between">
1313
<p
14-
class="text-xs min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-secondary">
14+
class="text-sm font-medium min-w-0 overflow-ellipsis overflow-hidden flex-1 text-text-primary">
1515
{{ name }}
1616
</p>
1717
<div v-if="working" class="flex space-x-1.5 items-center justify-end">
@@ -20,11 +20,11 @@ defineProps<{
2020
class="animate-ping absolute inline-flex h-full w-full rounded-full bg-green-500 opacity-75"></span>
2121
<span class="relative inline-flex rounded-full h-2 w-2 bg-green-500"></span>
2222
</span>
23-
<span class="text-green-500 font-medium text-sm block pb-0.5"> working </span>
23+
<span class="text-green-500 text-sm block pb-0.5"> working </span>
2424
</div>
2525
</div>
2626
<div
27-
class="text-text-secondary text-sm font-medium text-ellipsis whitespace-nowrap max-w-full overflow-hidden">
27+
class="text-text-secondary text-sm text-ellipsis whitespace-nowrap max-w-full overflow-hidden">
2828
{{ description }}
2929
</div>
3030
</div>

‎resources/js/Components/NavigationSidebarItem.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const open = useSessionStorage('nav-collapse-state-' + props.title, true);
2828
<CollapsibleRoot v-else v-model:open="open"
2929
><CollapsibleTrigger class="w-full group py-0.5">
3030
<div
31-
class="text-text-secondary group-hover:text-text-primary group-hover:bg-menu-active group flex gap-x-2 rounded-md transition leading-6 py-0.5 px-2 font-medium text-sm items-center justify-between">
31+
class="text-text-secondary group-hover:text-text-primary group-hover:bg-menu-active group flex gap-x-2 rounded-md transition leading-6 py-0.5 px-2 font-regular text-sm items-center justify-between">
3232
<div class="flex items-center gap-x-2">
3333
<component
3434
:is="icon"

‎resources/js/packages/ui/src/Buttons/SecondaryButton.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const sizeClasses = {
3232
:disabled="loading"
3333
:class="
3434
twMerge(
35-
'bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover shadow-sm transition text-text-primary rounded-lg font-semibold inline-flex items-center space-x-1.5 focus-visible:outline-none focus-visible:border-transparent focus-visible:ring-2 focus-visible:ring-ring focus:border-transparent disabled:opacity-25 ease-in-out',
35+
'bg-button-secondary-background border border-button-secondary-border hover:bg-button-secondary-background-hover shadow-sm transition text-text-primary rounded-lg font-medium inline-flex items-center space-x-1.5 focus-visible:outline-none focus-visible:border-transparent focus-visible:ring-2 focus-visible:ring-ring focus:border-transparent disabled:opacity-25 ease-in-out',
3636
sizeClasses[props.size],
3737
props.class
3838
)

0 commit comments

Comments
 (0)