diff --git a/packages/angular/src/app/components/library/task-kanban-card/task-kanban-card.component.html b/packages/angular/src/app/components/library/task-kanban-card/task-kanban-card.component.html index b5688ad9a..4f73a37a5 100644 --- a/packages/angular/src/app/components/library/task-kanban-card/task-kanban-card.component.html +++ b/packages/angular/src/app/components/library/task-kanban-card/task-kanban-card.component.html @@ -1,5 +1,5 @@
@@ -10,10 +10,10 @@ (onClick)="notify($event)" >
-
{{ task.text }}
+
{{ task.text }}
{{ task.priority }} - {{ + {{ task.dueDate | date: 'MM/dd/yyyy' }}
diff --git a/packages/angular/src/app/components/library/task-list-kanban/task-list-kanban.component.html b/packages/angular/src/app/components/library/task-list-kanban/task-list-kanban.component.html index 93205695a..46725330c 100644 --- a/packages/angular/src/app/components/library/task-list-kanban/task-list-kanban.component.html +++ b/packages/angular/src/app/components/library/task-list-kanban/task-list-kanban.component.html @@ -10,7 +10,7 @@ (onReorder)="onListReorder($event)" >
-
+
{{ board.name }}
diff --git a/packages/angular/src/app/theme/styles/variables-mixin.scss b/packages/angular/src/app/theme/styles/variables-mixin.scss index 81f757e43..b0f6fd620 100644 --- a/packages/angular/src/app/theme/styles/variables-mixin.scss +++ b/packages/angular/src/app/theme/styles/variables-mixin.scss @@ -2,18 +2,8 @@ $theme-mode: null !default; @use "devextreme/scss/widgets/fluent/colors" as * with ($color: "blue", $mode: $theme-mode); @use "devextreme/scss/widgets/fluent/sizes" as * with ($size: "default"); -@use "devextreme/scss/widgets/fluent/button/mixins" as *; -@use "devextreme/scss/widgets/fluent/popup/sizes" as *; -@use "devextreme/scss/widgets/fluent/textEditor/colors" as *; @use "devextreme/scss/widgets/fluent/fieldset/sizes" as *; -@use "devextreme/scss/widgets/fluent/toolbar/sizes" as toolbar_sizes; -@use "devextreme/scss/widgets/fluent/list/sizes" as *; -@use "devextreme/scss/widgets/fluent/button/sizes" as *; @use "theme-special" as * with ($theme: "fluent"); - -@forward "devextreme/scss/widgets/fluent/colors"; -@forward "devextreme/scss/widgets/fluent/textEditor/colors"; - @use "sass:math"; @use "sass:color"; @@ -22,7 +12,7 @@ $theme-mode: null !default; --typography-bg: var(--base-bg); @if variable-exists("base-typography-bg") { - --typography-bg: #{$base-typography-bg}; + --typography-bg: var(--dx-color-main-bg); } --side-panel-min-width: 48px; @@ -32,7 +22,7 @@ $theme-mode: null !default; --footer-height: 70px; --toolbar-vertical-padding: 16px; --toolbar-margin-bottom: var(--content-padding); - --base-bg: #{$base-bg}; + --base-bg: var(--dx-component-color-bg); --base-bg-darken-5: #{darken($base-bg, 5)}; --base-bg-darken-4: #{darken($base-bg, 4)}; --side-panel-background: var(--base-bg-darken-5); @@ -43,26 +33,25 @@ $theme-mode: null !default; --card-background: var(--base-bg-darken-5); } - --border-color: #{$base-border-color}; - --accent-color: #{$base-accent}; - --success-color: #{$base-success}; - --info-color: #{$base-accent}; - --warning-color: #{$base-warning}; - --error-color: #{$base-danger}; - --base-text-color: #{$base-text-color}; - --base-focus-color: #{$base-focus-color}; + --border-color: var(--dx-color-border); + --accent-color: var(--dx-color-primary); + --success-color: var(--dx-color-success); + --info-color: var(--dx-color-primary); + --warning-color: var(--dx-color-warning); + --error-color: var(--dx-color-danger); + --base-text-color: var(--dx-color-text); --background-gray-color: #{color.change($base-text-color, $alpha: 0.04)}; - --texteditor-edit-color: #{$texteditor-color}; - --texteditor-label-color: #{$texteditor-label-color}; + --texteditor-edit-color: var(--dx-texteditor-color-text); + --texteditor-label-color: var(--dx-texteditor-color-label); --base-text-color-alpha: #{rgba($base-text-color, alpha($base-text-color) * 0.7)}; - --toolbar-height: #{toolbar_sizes.$fluent-toolbar-height}; + --toolbar-height: var(--dx-toolbar-height); --filled-texteditor-input-horizontal-padding: #{$fluent-field-value-horizontal-padding}; - --list-padding-left: #{$fluent-list-item-horizontal-padding}; - --list-padding-vertical: #{$fluent-list-item-vertical-padding}; - --footer-left-padding: #{calc((var(--side-panel-min-width) - $fluent-base-icon-size) / 2)}; - --popup-toolbar-item-spacing: #{$fluent-popup-toolbar-item-spacing}; - --drop-down-gnrc-button-height: #{$fluent-base-inline-widget-height}; - --theme-padding: #{$fluent-button-horizontal-padding}; + --list-padding-left: var(--dx-list-item-padding-inline); + --list-padding-vertical: var(--dx-list-item-padding-block); + --footer-left-padding: calc((var(--side-panel-min-width) - var(--dx-font-size-icon)) / 2); + --popup-toolbar-item-spacing: var(--dx-popup-toolbar-item-padding-inline); + --drop-down-gnrc-button-height: var(--dx-component-height); + --theme-padding: var(--dx-button-padding-inline); --tooltip-danger-button-color: #{color.change($base-danger, $alpha: 0.1)}; --tooltip-success-button-color: #{color.change($base-success, $alpha: 0.1)}; --subtitle-text-color: var(--texteditor-label-color); diff --git a/packages/angular/src/styles.scss b/packages/angular/src/styles.scss index 322baf6d4..398b08e9c 100644 --- a/packages/angular/src/styles.scss +++ b/packages/angular/src/styles.scss @@ -11,6 +11,14 @@ body { box-sizing: border-box; } +.theme-text-color { + color: var(--dx-color-text); +} + +.theme-bg-color { + background-color: var(--dx-component-color-bg); +} + .header-text { @include header(); } diff --git a/packages/react/src/components/library/task-kanban-card/TaskKanbanCard.tsx b/packages/react/src/components/library/task-kanban-card/TaskKanbanCard.tsx index 698b0bf2f..32929f077 100644 --- a/packages/react/src/components/library/task-kanban-card/TaskKanbanCard.tsx +++ b/packages/react/src/components/library/task-kanban-card/TaskKanbanCard.tsx @@ -24,7 +24,7 @@ export const TaskKanbanCard = ({ task }: { task: Task }) => { }, []); return ( -
+