Skip to content

Commit d056527

Browse files
committed
Merge branch 'feature/adding-light-mode' into feature/better-style
2 parents 88a8d14 + d9d62a1 commit d056527

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/components/navbar/AddressChip.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export function AddressChip({ address }: { address: string }) {
4040
<Tooltip open={showTooltip}>
4141
<TooltipTrigger asChild>
4242
<Button
43-
className="dark:bg-popover bg-brand-foreground hover:bg-muted text-primary dark:text-brand duration-300"
43+
className="dark:bg-popover bg-primary-foreground hover:bg-muted text-primary dark:text-brand duration-300"
4444
variant="secondary"
4545
onClick={handleCopy}
4646
onMouseEnter={handleMouseEnter}

src/components/ui/input.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
77
type={type}
88
data-slot="input"
99
className={cn(
10-
'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
10+
'file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm',
1111
'focus-visible:border-ring',
1212
'aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive',
1313
className

src/index.css

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
--tooltip-border: var(--color-grey-700);
220220

221221
--brand: var(--color-yellow-300);
222-
--brand-foreground: var(--primary-foreground);
222+
--brand-foreground: var(--color-grey-900);
223223

224224
--primary: #183ee9;
225225
--primary-foreground: #f4f7fc;
@@ -228,7 +228,7 @@
228228
--secondary-foreground: oklch(0.205 0 0);
229229

230230
--muted: oklch(0.97 0 0);
231-
--muted-foreground: oklch(0.556 0 0);
231+
--muted-foreground: var(--color-grey-500);
232232

233233
--intermediate: var(--color-grey-200);
234234
--intermediate-foreground: var(--color-grey-500);
@@ -239,7 +239,7 @@
239239
--destructive: var(--color-red-400);
240240
--border: var(--color-grey-200);
241241
--input: oklch(0.922 0 0);
242-
--ring: oklch(0.708 0 0);
242+
--ring: var(--color-primary);
243243
}
244244

245245
.dark {

src/modules/datasets/SchemaSearch.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export function SchemaSearch({
7373
: 'translate-y-2 grid-rows-[0fr]'
7474
)}
7575
>
76-
<div className={cn('text-grey-200 grid overflow-hidden px-6 md:px-10')}>
76+
<div className={cn('grid overflow-hidden px-6 md:px-10')}>
7777
<hr className="border-secondary" />
7878
<div
7979
className={cn(
@@ -84,7 +84,9 @@ export function SchemaSearch({
8484
)}
8585
>
8686
<div className="flex flex-wrap items-center gap-2.5 overflow-hidden">
87-
Filter by field types:{' '}
87+
<span className="text-muted-foreground">
88+
Filter by field types:
89+
</span>{' '}
8890
{filters.map((schema, index) => {
8991
const borderColor = borderTypeColor.find((color) =>
9092
color.keywords.some((keyword) =>

0 commit comments

Comments
 (0)