diff --git a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts index ddd8ace..2dd942b 100644 --- a/frontend/src/app/ntt-gantt/ntt-gantt.component.ts +++ b/frontend/src/app/ntt-gantt/ntt-gantt.component.ts @@ -904,7 +904,7 @@ export class NttGanttComponent implements OnInit { */ public queryTaskbarInfo(args: any) { - console.log(args); + console.log(args.milestoneColor); if (args.taskbarType == 'Milestone' && args.data.taskData.TaskID.includes("D2")) { if (args.data.taskData.isFixed == false) { args.taskbarElement.children[1].classList.add('e-gantt-milestone-border1'); diff --git a/frontend/src/index.html b/frontend/src/index.html index d0e92fe..0cbd7de 100644 --- a/frontend/src/index.html +++ b/frontend/src/index.html @@ -29,7 +29,7 @@ } */ - .e-gantt-milestone-border { + /* .e-gantt-milestone-border { border-radius: 50%; color: red; background-color: transparent !important; @@ -61,7 +61,7 @@ cursor: not-allowed !important; - } + } */ diff --git a/frontend/src/theme.scss b/frontend/src/theme.scss index 73af48a..5016042 100644 --- a/frontend/src/theme.scss +++ b/frontend/src/theme.scss @@ -1,16 +1,24 @@ -@import "../node_modules/@angular/material/theming"; -@include mat-core(); +@use '@angular/material' as mat; -$my-primary: mat-palette($mat-orange, 800); -$my-accent: mat-palette($mat-orange, 500); -$my-warn: mat-palette($mat-red, 600); +@include mat.core(); -$my-theme: mat-light-theme($my-primary, $my-accent, $my-warn); +$my-primary: mat.define-palette(mat.$orange-palette, 800); +$my-accent: mat.define-palette(mat.$orange-palette, 500); +$my-warn: mat.define-palette(mat.$red-palette, 600); -@include angular-material-theme($my-theme); +$my-theme: mat.define-light-theme(( + color: ( + primary: $my-primary, + accent: $my-accent, + warn: $my-warn, + ) +)); + +@include mat.all-component-themes($my-theme); .dateButton.mat-button { - background-color: blue !important; /* Use !important as a last resort */ + background-color: blue !important; color: white; - } - \ No newline at end of file +} + +