Skip to content

Commit 34f558b

Browse files
Oluwadaminiolajirevwe
Oluwadaminiola
and
jirevwe
authored
Update dashboard theme (frain-dev#1874)
* add radix colors * update events filter component * update filter * update color config and pages * fix merge conflicts * fix signature modal (frain-dev#1939) * Update radio/dropdown component (frain-dev#1943) * fix dropdowns * update radio component * feat: update endpoint name and title (frain-dev#1945) * fix: add project meta-event to frontend (frain-dev#1916) * Re-implement rate limiter using postgres (frain-dev#1937) * feat: reimplement rate limiter using postgres * feat: add bucket size (time duration) for rate limit * chore: update tests * chore: revert postgres pkg changes * chore: go mod tidy * feat: update rate when endpoint is updated * feat: set default rate limit value to 0 * chore: update function name, add benchmarks * chore: update test * chore: update changes from main, remove dependency on the subscription repo * fix endpointst page (frain-dev#1948) * chore: make rate limiter fail-open (frain-dev#1950) * add radix colors * update color config and pages * fix merge conflicts * update package-lock.json --------- Co-authored-by: Raymond Tukpe <jirevwe@users.noreply.github.com>
1 parent 4ad6a96 commit 34f558b

File tree

71 files changed

+2079
-16225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+2079
-16225
lines changed

‎web/ui/dashboard/package-lock.json

+1,581-15,755
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/ui/dashboard/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"@angular/router": "^14.0.3",
2222
"@auth0/angular-jwt": "^5.1.2",
2323
"@markdoc/markdoc": "^0.1.12",
24+
"@radix-ui/colors": "^3.0.0",
2425
"@tailwindcss/container-queries": "^0.1.1",
2526
"@types/markdown-it": "^12.2.3",
2627
"@types/react": "^18.0.21",

‎web/ui/dashboard/src/app/components/card/card.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ export class CardComponent implements OnInit {
2020

2121
get classes(): string {
2222
const colors = {
23-
default: 'bg-white-100 border border-new.gray-100 shadow-xs',
23+
default: 'bg-white-100 border border-neutral-4',
2424
danger: 'bg-danger-500 border border-danger-200'
2525
};
26-
return `${colors[this.color]} ${this.hover === 'true' ? 'focus:shadow-sm hover:shadow-sm focus-visible:shadow-sm hover:border-grey-20 focus:border-grey-20 focus-visible:border-grey-20 outline-none transition-all duration-300' : ''} block`;
26+
return `${colors[this.color]} ${this.hover === 'true' ? 'focus:shadow-default hover:shadow-default focus-visible:shadow-default hover:border-neutral-4 focus:border-neutral-4 focus-visible:border-neutral-4 outline-none transition-all duration-300' : ''} block`;
2727
}
2828
}

‎web/ui/dashboard/src/app/components/chart/chart.component.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<div class="w-full">
22
<div class="flex justify-between h-100px" *ngIf="isLoading">
33
<div class="loader mr-2px last-of-type:mr-0 flex items-end relative w-full h-full" *ngFor="let size of loaderSizes">
4-
<div class="min-h-[4px] w-full bg-grey-10 rounded-4px animate-pulse hover:cursor-pointer transition-all duration-300" [ngStyle]="{ height: size + 'px' }"></div>
4+
<div class="min-h-[4px] w-full bg-neutral-a3 rounded-4px animate-pulse hover:cursor-pointer transition-all duration-300" [ngStyle]="{ height: size + 'px' }"></div>
55
</div>
66
</div>
77

88
<ng-container *ngIf="!isLoading">
99
<div class="flex gap-x-1 justify-end">
1010
<div class="mr-2px last-of-type:mr-0 w-full group" *ngFor="let data of paginatedData; let i = index">
1111
<div class="flex items-end h-100px hover:cursor-pointer">
12-
<div [class]="data.data > 0 ? 'bg-primary-100 bg-opacity-70 rounded-tl-8px rounded-tr-8px' : 'bg-grey-10 rounded-4px group-hover:bg-grey-40'" class="min-h-[4px] w-full transition-all duration-300 relative" [ngStyle]="{ height: data.size }">
12+
<div [class]="data.data > 0 ? 'bg-primary-100 bg-opacity-70 rounded-tl-8px rounded-tr-8px' : 'bg-neutral-a3 rounded-4px group-hover:bg-neutral-10'" class="min-h-[4px] w-full transition-all duration-300 relative" [ngStyle]="{ height: data.size }">
1313
<div
1414
class="
1515
absolute
@@ -45,7 +45,7 @@
4545
after:left-1/2
4646
after:-translate-x-1/2
4747
after:border-[12px] after:border-t-white-100 after:border-b-transparent after:border-x-transparent
48-
after:outline-1 after:outline-grey-20
48+
after:outline-1 after:outline-neutral-4
4949
"
5050
[ngClass]="{ 'before:hidden': data.data === 0 }"
5151
>
@@ -57,10 +57,10 @@ <h3 class="font-semibold text-12">{{ data.label }}</h3>
5757
</div>
5858
</div>
5959

60-
<div class="line flex items-center justify-between mt-14px border-t border-grey-10 pt-4px">
61-
<div class="text-grey-40 text-10">{{ paginatedData[0].label }}</div>
62-
<div class="text-grey-40 text-10">{{ paginatedData[15].label }}</div>
63-
<div class="text-grey-40 text-10">{{ paginatedData[paginatedData.length - 1].label }}</div>
60+
<div class="line flex items-center justify-between mt-14px border-t border-neutral-a3 pt-4px">
61+
<div class="text-neutral-11 text-10">{{ paginatedData[0].label }}</div>
62+
<div class="text-neutral-11 text-10">{{ paginatedData[15].label }}</div>
63+
<div class="text-neutral-11 text-10">{{ paginatedData[paginatedData.length - 1].label }}</div>
6464
</div>
6565

6666
<div class="flex items-center justify-end mt-16px" [class]="pages === 1 ? 'hidden' : 'flex'">

‎web/ui/dashboard/src/app/components/copy-button/copy-button.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div [class]="class">
22
<button convoy-button fill="text" type="button" size="sm" (click)="copyItem($event)" class="relative">
3-
<svg width="16" height="16" [attr.height]="size === 'sm' ? '14' : '16'" [attr.width]="size === 'sm' ? '14' : '16'" [class]="color === 'gray' ? 'stroke-new.gray-400' : 'stroke-new.primary-400'" *ngIf="showIcon == 'true'">
3+
<svg width="16" height="16" [attr.height]="size === 'sm' ? '14' : '16'" [attr.width]="size === 'sm' ? '14' : '16'" [class]="color === 'gray' ? 'stroke-neutral-10' : 'stroke-new.primary-400'" *ngIf="showIcon == 'true'">
44
<use [attr.xlink:href]="size === 'sm' ? '#copy-icon-3' : '#copy-icon-2'"></use>
55
</svg>
66
<ng-content></ng-content>

‎web/ui/dashboard/src/app/components/date-picker/date-picker.component.html

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
<div class="calendar-nav flex items-center justify-between">
1212
<div class="flex items-center">
1313
<button type="button" (click)="setMonth(-2)">
14-
<svg width="24" height="24" class="fill-grey-40">
14+
<svg width="24" height="24" class="fill-neutral-10">
1515
<use xlink:href="#arrow-left-icon"></use>
1616
</svg>
1717
</button>
1818
</div>
1919

20-
<div class="text-center text-h4 text-new.gray-900 font-semibold">{{ monthMap[month] }} {{ year }}</div>
20+
<div class="text-center text-h4 text-neutral-12 font-semibold">{{ monthMap[month] }} {{ year }}</div>
2121

2222
<div class="flex items-center"></div>
2323
</div>
2424

25-
<div class="grid grid-cols-7 py-10px capitalize items-center text-center mt-20px font-semibold text-new.gray-900">
25+
<div class="grid grid-cols-7 py-10px capitalize items-center text-center mt-20px font-semibold text-neutral-12">
2626
<div class="text-14">S</div>
2727
<div class="text-14">M</div>
2828
<div class="text-14">T</div>
@@ -33,7 +33,7 @@
3333
</div>
3434

3535
<div class="days flex flex-wrap text-center mt-10px">
36-
<button type="button" class="text-12 w-40px h-40px text-new.gray-600" [class]="getDayClassNames(date)" *ngFor="let date of datesForLeftCalendar" (click)="onselectDay(date.timestamp)">
36+
<button type="button" class="text-12 w-40px h-40px text-neutral-10" [class]="getDayClassNames(date)" *ngFor="let date of datesForLeftCalendar" (click)="onselectDay(date.timestamp)">
3737
{{ date.date }}
3838
</button>
3939
</div>
@@ -49,18 +49,18 @@
4949
<div class="calendar-nav flex items-center justify-between">
5050
<div class="flex items-center"></div>
5151

52-
<div class="text-center text-h4 text-new.gray-900 font-semibold">{{ monthMap[monthRight] }} {{ yearRight }}</div>
52+
<div class="text-center text-h4 text-neutral-12 font-semibold">{{ monthMap[monthRight] }} {{ yearRight }}</div>
5353

5454
<div class="flex items-center">
5555
<button type="button" (click)="setMonth(2)">
56-
<svg width="24" height="24" class="fill-grey-40">
56+
<svg width="24" height="24" class="fill-neutral-10">
5757
<use xlink:href="#arrow-right-icon"></use>
5858
</svg>
5959
</button>
6060
</div>
6161
</div>
6262

63-
<div class="grid grid-cols-7 py-10px capitalize items-center text-center mt-20px font-semibold text-new.gray-900">
63+
<div class="grid grid-cols-7 py-10px capitalize items-center text-center mt-20px font-semibold text-neutral-12">
6464
<div class="text-14">S</div>
6565
<div class="text-14">M</div>
6666
<div class="text-14">T</div>
@@ -71,7 +71,7 @@
7171
</div>
7272

7373
<div class="days flex flex-wrap text-center mt-10px">
74-
<button type="button" class="text-12 w-40px h-40px text-new.gray-600 empty:hidden" *ngFor="let date of datesForRightCalendar; let i = index" [class]="getDayClassNamesRightCalendar(date)" (click)="onselectDay(date.timestamp)">
74+
<button type="button" class="text-12 w-40px h-40px text-neutral-10 empty:hidden" *ngFor="let date of datesForRightCalendar; let i = index" [class]="getDayClassNamesRightCalendar(date)" (click)="onselectDay(date.timestamp)">
7575
{{ date.date }}
7676
</button>
7777
</div>

‎web/ui/dashboard/src/app/components/dialog/dialog.directive.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { ButtonComponent } from '../button/button.component';
88
imports: [CommonModule, ButtonComponent],
99
standalone: true,
1010
template: `
11-
<div class="px-20px pt-20px pb-16px border-y border-y-grey-10 bg-white-100 rounded-tr-16px rounded-tl-16px w-full ">
11+
<div class="px-20px pt-20px pb-16px border-y border-y-neutral-4 bg-white-100 rounded-tr-16px rounded-tl-16px w-full ">
1212
<div class="flex justify-between items-center max-w-[770px] m-auto">
1313
<div class="flex items-center w-full" [ngClass]="{ 'justify-between': fullscreen === 'false' }">
1414
<div class="w-full" [class]="fullscreen !== 'false' ? 'order-2' : 'order-1'">

‎web/ui/dashboard/src/app/components/dropdown-container/dropdown-container.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { Directive, Input, OnInit } from '@angular/core';
33
@Directive({
44
selector: '[convoy-dropdown-container]',
55
standalone: true,
6-
host: { class: 'absolute w-full bg-white-100 border border-grey-10 rounded-12px shadow-default z-10 transition-all ease-in-out duration-300 h-fit max-h-[440px]', '[class]': 'classes' }
6+
host: { class: 'absolute w-full bg-white-100 border border-neutral-a3 rounded-12px shadow-default z-10 transition-all ease-in-out duration-300 h-fit max-h-[440px]', '[class]': 'classes' }
77
})
88
export class DropdownContainerComponent implements OnInit {
99
@Input('position') position: 'right' | 'left' | 'center' | 'right-side' = 'right';

‎web/ui/dashboard/src/app/components/empty-state/empty-state.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div class="flex flex-col items-center justify-center">
22
<img *ngIf="imgSrc" [src]="imgSrc" alt="empty state" class="mb-46px h-156px" />
3-
<h2 *ngIf="heading" class="font-bold mb-14px text-16 text-new.gray-800 text-center">{{ heading }}</h2>
4-
<p *ngIf="description" class="text-14 text-new.gray-500 w-full max-w-[410px] text-center mt-8px">{{ description }}</p>
3+
<h2 *ngIf="heading" class="font-bold mb-14px text-16 text-neutral-12 text-center">{{ heading }}</h2>
4+
<p *ngIf="description" class="text-14 text-neutral-10 w-full max-w-[410px] text-center mt-8px">{{ description }}</p>
55
<button convoy-button *ngIf="buttonText" class="mt-22px" (click)="onAction.emit()">{{ buttonText }}</button>
66
<div class="empty:hidden">
77
<ng-content select="[emptyStateCTA]"></ng-content>

‎web/ui/dashboard/src/app/components/file-input/file-input.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
<div *ngIf="file" class="border border-new.primary-300 rounded-4px flex p-18px hover:border-white-100 focus-within:border-white-100 group">
77
<img src="/assets/img/file.png" class="mb-12px" alt="download icon" />
88
<div class="flex flex-col ml-10px">
9-
<p class="text-12 text-new.gray-600">{{ file.name }}</p>
10-
<p class="text-10 text-new.gray-500">{{ fileSize(file.size) }}</p>
9+
<p class="text-12 text-neutral-10">{{ file.name }}</p>
10+
<p class="text-10 text-neutral-11">{{ fileSize(file.size) }}</p>
1111
</div>
1212
<div
13-
class="hidden group-focus-within:absolute group-focus-within:flex group-hover:absolute group-hover:flex backdrop-blur-sm rounded-4px top-0 w-full h-[80px] -ml-[19px] mt-28px bg-new.gray-400 bg-opacity-50 items-center flex-col justify-center p-24px transition-all duration-300"
13+
class="hidden group-focus-within:absolute group-focus-within:flex group-hover:absolute group-hover:flex backdrop-blur-sm rounded-4px top-0 w-full h-[80px] -ml-[19px] mt-28px bg-neutral-10 bg-opacity-50 items-center flex-col justify-center p-24px transition-all duration-300"
1414
>
1515
<button convoy-button fill="clear" type="button" (click)="file = null; deleteFile.emit()">
1616
<svg width="24" height="23" class="mr-8px fill-white-100">

‎web/ui/dashboard/src/app/components/input/input.component.ts

+9-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { TooltipComponent } from '../tooltip/tooltip.component';
77
selector: '[convoy-input]',
88
standalone: true,
99
host: {
10-
class: 'transition-all duration-[.3s] w-full font-normal text-12 placeholder:text-new.gray-300 text-new.gray-600 border border-new.gray-200 disabled:text-new.gray-400 disabled:border-new.primary-25 hover:border-new.primary-100 focus:border-new.primary-300 outline-none rounded-4px placeholder:text-14 bg-white-100 py-12px px-16px appearance-none',
10+
class: 'transition-all duration-[.3s] w-full font-normal text-12 placeholder:text-neutral-6 text-neutral-11 border border-neutral-4 disabled:text-neutral-6 disabled:border-new.primary-25 hover:border-new.primary-100 focus:border-new.primary-300 outline-none rounded-4px placeholder:text-14 bg-white-100 py-12px px-16px appearance-none',
1111
'[ngClass]': "{ 'pointer-events-none': readonly, 'appearance-none': type !== 'password' }"
1212
}
1313
})
@@ -56,9 +56,11 @@ export class PasswordInputFieldComponent implements OnInit {
5656
standalone: true,
5757
imports: [CommonModule],
5858
template: `
59-
<div class="flex items-center text-12 text-danger-100 mt-8px">
60-
<img src="assets/img/input-error-icon.svg" class="mr-6px w-16px" alt="input error icon" />
61-
<span><ng-content></ng-content></span>
59+
<div class="flex items-center text-12 mt-8px">
60+
<svg width="16" height="16" class="mr-6px fill-error-9">
61+
<use xlink:href="#error-icon"></use>
62+
</svg>
63+
<span class="text-error-9"><ng-content></ng-content></span>
6264
</div>
6365
`
6466
})
@@ -74,14 +76,14 @@ export class InputErrorComponent implements OnInit {
7476
standalone: true,
7577
imports: [CommonModule, TooltipComponent],
7678
host: {
77-
class: 'w-full text-12 text-new.gray-500 mb-8px flex items-center justify-between'
79+
class: 'w-full text-12 mb-8px flex items-center justify-between'
7880
},
7981
template: `
80-
<div class="flex items-center">
82+
<div class="flex items-center text-neutral-9">
8183
<ng-content></ng-content>
8284
<convoy-tooltip *ngIf="tooltip" class="ml-4px" size="sm">{{ tooltip }}</convoy-tooltip>
8385
</div>
84-
<span *ngIf="required === 'true'" class="text-10 text-new.gray-400 px-6px rounded-22px font-medium bg-new.gray-100">required</span>
86+
<span *ngIf="required === 'true'" class="text-10 text-gray-11 px-6px rounded-22px font-medium bg-neutral-a3">required</span>
8587
`,
8688
styleUrls: ['./input.component.scss']
8789
})

‎web/ui/dashboard/src/app/components/list-item/list-item.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export class ListItemComponent implements OnInit {
1919
ngOnInit(): void {}
2020

2121
get class() {
22-
return `${this.hasBorder ? 'border-grey-10 border-b' : ''} ${this.active === 'true' ? 'bg-primary-500' : ''}`;
22+
return `${this.hasBorder ? 'border-neutral-a3 border-b' : ''} ${this.active === 'true' ? 'bg-primary-500' : ''}`;
2323
}
2424
}

‎web/ui/dashboard/src/app/components/multi-input/multi-input.component.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
<label for="input" class="text-12 text-new.gray-400 mt-24px flex items-center justify-between" *ngIf="label">
1+
<label for="input" class="text-12 text-neutral-11 mt-24px flex items-center justify-between" *ngIf="label">
22
<div class="flex items-center">
33
{{ label }}
44
<convoy-tooltip size="sm" position="top-right" class="ml-4px" *ngIf="tooltip">{{ tooltip }}</convoy-tooltip>
55
</div>
6-
<span *ngIf="required === 'true'" class="text-10 text-new.gray-400 px-6px rounded-22px font-medium bg-new.gray-100">required</span>
6+
<span *ngIf="required === 'true'" class="text-10 text-neutral-11 px-6px rounded-22px font-medium bg-neutral-a3">required</span>
77
</label>
88

9-
<div (click)="focusInput()" class="w-full font-medium text-14 text-new.gray-800 border border-new.primary-25 outline-none rounded-4px bg-white-100 pt-12px pb-8px px-12px mt-8px relative flex flex-row flex-wrap items-center">
10-
<div *ngFor="let key of keys" class="border border-new.gray-200 py-4px px-8px font-medium text-12 text-new.gray-400 mr-1 mb-1 rounded-22px flex items-center">
9+
<div (click)="focusInput()" class="w-full font-medium text-14 text-neutral-12 border border-new.primary-25 outline-none rounded-4px bg-white-100 pt-12px pb-8px px-12px mt-8px relative flex flex-row flex-wrap items-center">
10+
<div *ngFor="let key of keys" class="border border-neutral-5 py-4px px-8px font-medium text-12 text-neutral-10 mr-1 mb-1 rounded-22px flex items-center">
1111
{{ key === '*' ? 'All Events' : key }}
1212
<button convoy-button (click)="removeKey(key)" fill="text" type="button" class="py-0 px-0 ml-4px">
13-
<svg width="14" height="14" class="fill-grey-40">
13+
<svg width="14" height="14" class="fill-neutral-10">
1414
<use xlink:href="#close-icon-2"></use>
1515
</svg>
1616
</button>

‎web/ui/dashboard/src/app/components/radio/radio.component.html

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
<div class="relative h-full hover:cursor-pointer">
1+
<div class="relative h-full">
22
<input #radioInput type="radio" [id]="id" [name]="name" [formControl]="control" [value]="value" [checked]="checked" class="peer opacity-0 absolute" />
3-
<label [for]="id" class="bg-white-100 border border-new.gray-200 rounded-4px p-16px block transition-all duration-200 peer-checked:border-new.primary-300 peer-checked:bg-[#FAFAFE] h-full cursor-pointer">
3+
<label [for]="id" class="bg-white-100 border border-neutral-5 rounded-4px p-16px block transition-all duration-200 peer-checked:border-new.primary-300 peer-checked:bg-[#FAFAFE] h-full cursor-pointer">
44
<div class="flex justify-between">
55
<div class="flex items-start">
66
<div class="w-16px"></div>
77
<div class="ml-20px">
8-
<p class="text-12 text-new.gray-600 font-semibold">{{ label }}</p>
9-
<p *ngIf="description" class="text-new.gray-500 text-12 text-left font-normal">{{ description }}</p>
8+
<p class="text-12 text-neutral-10 font-semibold">{{ label }}</p>
9+
<p *ngIf="description" class="text-neutral-11 text-12 text-left font-normal">{{ description }}</p>
1010
</div>
1111
</div>
1212
<convoy-tooltip *ngIf="tooltipContent" [position]="tooltipPosition" [size]="tooltipSize">
1313
{{ tooltipContent }}
1414
</convoy-tooltip>
1515
</div>
1616
</label>
17-
<div class="absolute top-20px left-[17px] rounded-[50px] mb-0 border border-new.gray-400 w-16px h-16px transition-all duration-200 peer-checked:border-new.primary-300 peer-checked:border-[5px]" (click)="radioInput.click()"></div>
17+
<div class="absolute top-20px left-[17px] rounded-[50px] mb-0 border border-neutral-10 w-16px h-16px transition-all duration-200 peer-checked:border-new.primary-300 peer-checked:border-[5px]" (click)="radioInput.click()"></div>
1818
</div>

‎web/ui/dashboard/src/app/components/select/select.component.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<div
88
convoy-input
99
class="
10-
peer-disabled:text-new.gray-300 peer-disabled:border-new.primary-25 peer-disabled:bg-white-100 peer-[ng-invalid]:border-danger-100
10+
peer-disabled:text-neutral-4 peer-disabled:border-new.primary-25 peer-disabled:bg-white-100 peer-[ng-invalid]:border-danger-100
1111
py-12px
1212
px-16px
1313
appearance-none
@@ -22,10 +22,10 @@
2222
>
2323
<span *ngIf="!multiple">{{ selectedValue?.name || selectedValue?.title || selectedValue }}</span>
2424
<ng-container *ngIf="multiple">
25-
<div *ngFor="let option of selectedOptions" class="border border-new.gray-200 py-4px px-8px font-medium text-12 text-new.gray-400 mr-1 mb-1 rounded-22px flex items-center">
25+
<div *ngFor="let option of selectedOptions" class="border border-neutral-5 py-4px px-8px font-medium text-12 text-neutral-10 mr-1 mb-1 rounded-22px flex items-center">
2626
{{ option.name || option.title || option }}
2727
<button convoy-button (click)="removeOption(option)" fill="text" type="button" class="py-0 px-0 ml-4px">
28-
<svg width="14" height="14" class="fill-grey-40">
28+
<svg width="14" height="14" class="fill-neutral-10">
2929
<use xlink:href="#close-icon-2"></use>
3030
</svg>
3131
</button>
@@ -49,7 +49,7 @@
4949
</div>
5050
</li>
5151
</ng-container>
52-
<li class="text-14 text-grey-20">Select</li>
52+
<li class="text-14 text-neutral-4">Select</li>
5353

5454
<ng-container *ngIf="multiple">
5555
<li *ngFor="let option of options" class="list-none py-10px border-b border-new.primary-25">

‎web/ui/dashboard/src/app/components/skeleton-loader/skeleton-loader.component.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<div [class]="class" class="rounded-[24px] bg-grey-10 animate-pulse"></div>
1+
<div [class]="class" class="rounded-[24px] bg-neutral-a3 animate-pulse"></div>

‎web/ui/dashboard/src/app/components/table/table.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { CommonModule } from '@angular/common';
44
@Directive({
55
selector: 'convoy-table, [convoy-table]',
66
standalone: true,
7-
host: { class: 'w-full h-fit text-new.gray-600', id: 'table' }
7+
host: { class: 'w-full h-fit text-neutral-10', id: 'table' }
88
})
99
export class TableComponent implements OnInit {
1010
constructor() {}
@@ -19,7 +19,7 @@ export class TableComponent implements OnInit {
1919
imports: [CommonModule],
2020
host: { class: 'p-0 ' },
2121
template: `
22-
<div [class]="forDate ? 'pt-16px pl-16px pb-8px text-new.gray-400' : 'pt-12px pb-12px whitespace-nowrap text-new.gray-900'" class="flex flex-row items-center text-12 font-normal">
22+
<div [class]="forDate ? 'pt-16px pl-16px pb-8px text-neutral-10' : 'pt-12px pb-12px whitespace-nowrap text-neutral-12'" class="flex flex-row items-center text-12 font-normal">
2323
<ng-content></ng-content>
2424
</div>
2525
`

0 commit comments

Comments
 (0)