Skip to content

Commit 62b5730

Browse files
committed
fix contrast on select and dropdown foreground colors, add missing placeholder in billable input
1 parent 098ead8 commit 62b5730

File tree

6 files changed

+15
-7
lines changed

6 files changed

+15
-7
lines changed

resources/css/app.css

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@
4343

4444
--theme-color-input-select-active: rgb(var(--color-accent-300));
4545
--theme-color-input-select-active-hover: rgb(var(--color-accent-200));
46+
47+
--color-accent-default: rgb(var(--color-accent-900));
48+
--color-accent-foreground: rgb(var(--color-accent-100));
4649
}
4750

4851
:root.light {
@@ -86,6 +89,9 @@
8689

8790
--theme-color-input-select-active: rgb(var(--color-accent-400));
8891
--theme-color-input-select-active-hover: rgb(var(--color-accent-500));
92+
93+
--color-accent-default: rgb(var(--color-accent-100));
94+
--color-accent-foreground: rgb(var(--color-accent-800));
8995
}
9096

9197
:root {

resources/js/Components/Common/Reporting/ReportingChart.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,9 @@ const xAxisLabels = computed(() => {
4343
if (props.groupedType === 'week') {
4444
return props?.groupedData?.map((el) => formatWeek(el.key));
4545
}
46-
return props?.groupedData?.map((el) => formatDate(el.key ?? '', organization?.value?.date_format));
46+
return props?.groupedData?.map((el) =>
47+
formatDate(el.key ?? '', organization?.value?.date_format)
48+
);
4749
});
4850
const accentColor = useCssVar('--theme-color-chart', null, { observe: true });
4951
const labelColor = useCssVar('--color-text-secondary', null, { observe: true });

resources/js/Components/ui/calendar/CalendarCellTrigger.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const forwardedProps = useForwardProps(delegatedProps)
2020
:class="cn(
2121
buttonVariants({ variant: 'ghost' }),
2222
'h-8 w-8 p-0 font-normal',
23-
'[&[data-today]:not([data-selected])]:bg-accent [&[data-today]:not([data-selected])]:text-accent-foreground',
23+
'[&[data-today]:not([data-selected])]:border-accent [&[data-today]:not([data-selected])]:border [&[data-today]:not([data-selected])]:text-accent-foreground',
2424
// Selected
2525
'data-[selected]:bg-primary data-[selected]:text-primary-foreground data-[selected]:opacity-100 data-[selected]:hover:bg-primary data-[selected]:hover:text-primary-foreground data-[selected]:focus:bg-primary data-[selected]:focus:text-primary-foreground',
2626
// Disabled

resources/js/Components/ui/range-calendar/RangeCalendarCellTrigger.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const forwardedProps = useForwardProps(delegatedProps)
2020
:class="cn(
2121
buttonVariants({ variant: 'ghost' }),
2222
'h-8 w-8 p-0 font-normal data-[selected]:opacity-100',
23-
'[&[data-today]:not([data-selected])]:bg-accent [&[data-today]:not([data-selected])]:text-accent-foreground',
23+
'[&[data-today]:not([data-selected])]:border-accent [&[data-today]:not([data-selected])]:border [&[data-today]:not([data-selected])]:text-accent-foreground',
2424
// Selection Start
2525
'data-[selection-start]:bg-primary data-[selection-start]:text-primary-foreground data-[selection-start]:hover:bg-primary data-[selection-start]:hover:text-primary-foreground data-[selection-start]:focus:bg-primary data-[selection-start]:focus:text-primary-foreground',
2626
// Selection End

resources/js/packages/ui/src/Input/BillableRateInput.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ function formatValue(modelValue: number | null) {
4141
currencyDisplay: 'code',
4242
currencySign: 'accounting',
4343
}"
44-
@update:model-value="(value) => model = value * 100">
44+
@update:model-value="(value) => (model = value * 100)">
4545
<NumberFieldContent>
4646
<NumberFieldDecrement />
47-
<NumberFieldInput />
47+
<NumberFieldInput placeholder="Billable Rate" />
4848
<NumberFieldIncrement />
4949
</NumberFieldContent>
5050
</NumberField>

tailwind.config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@ export default {
8787
"800": "rgba(var(--color-accent-800), <alpha-value>)",
8888
"900": "rgba(var(--color-accent-900), <alpha-value>)",
8989
"950": "rgba(var(--color-accent-950), <alpha-value>)",
90-
DEFAULT: "var(--color-bg-tertiary)",
91-
foreground: "rgb(var(--color-accent-200))"
90+
DEFAULT: "var(--color-accent-default)",
91+
foreground: "var(--color-accent-foreground)",
9292
},
9393
"button-primary-background": "var(--theme-color-button-primary-background)",
9494
"button-primary-background-hover": "var(--theme-color-button-primary-background-hover)",

0 commit comments

Comments
 (0)