diff --git a/apps/red-ui/src/app/components/base-screen/base-screen.component.html b/apps/red-ui/src/app/components/base-screen/base-screen.component.html index a46191b8f..49901094f 100644 --- a/apps/red-ui/src/app/components/base-screen/base-screen.component.html +++ b/apps/red-ui/src/app/components/base-screen/base-screen.component.html @@ -4,7 +4,7 @@ diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html index 8c5a1381e..b9687a5ad 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.html @@ -22,27 +22,25 @@
{{ subtitle }}
-
-
-
+
+ - - -
+
diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss index 321b18b7c..50f6f089a 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.scss @@ -41,31 +41,27 @@ .breakdown-container { display: flex; flex-direction: column; - align-items: center; + align-items: flex-start; margin-left: -8px; > div { - width: fit-content; + border-radius: 4px; + padding: 3px 8px; - > div { - border-radius: 4px; - padding: 3px 8px; + &:not(:last-child) { + margin-bottom: 8px; + } - &:not(:last-child) { - margin-bottom: 8px; - } + &:not(.filter-disabled) { + cursor: pointer; + } - &:not(.filter-disabled) { - cursor: pointer; - } + &:hover:not(.active):not(.filter-disabled) { + background-color: variables.$grey-6; + } - &:hover:not(.active):not(.filter-disabled) { - background-color: variables.$grey-6; - } - - &.active { - background-color: rgba(variables.$primary, 0.1); - } + &.active { + background-color: rgba(variables.$primary, 0.1); } } } diff --git a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts index ec11bf6e7..36bdf09ff 100644 --- a/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/simple-doughnut-chart/simple-doughnut-chart.component.ts @@ -26,6 +26,7 @@ export class SimpleDoughnutChartComponent implements OnChanges, OnInit { @Input() totalType: 'sum' | 'count' = 'sum'; @Input() counterText: string; @Input() filterKey = 'statusFilters'; + @Input() helpModeKey: 'filter-for-status'; filtersEnabled: boolean; chartData: any[] = []; diff --git a/libs/common-ui b/libs/common-ui index 333bd0991..53c3a6b30 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 333bd099140f20deab75278bd02d20d3fdddae88 +Subproject commit 53c3a6b30494f063ca323cb21ffff072c3204db2