Merge pull request #2700 from Azure/mhdahman/a11y-luminosity-contrast-2

Fixes AB#568, AB#569, AB#589
Azure · Apr 6, 2023 · cbd0b1d · cbd0b1d
2 parents d1abd51 + c7bb9bb
commit cbd0b1d
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 17 deletions.
diff --git a/data/themes/classic.json b/data/themes/classic.json
@@ -3,7 +3,7 @@
   "type": "standard",
   "primary": "#2F71C4",
   "primary-contrast": "#ffffff",
-  "danger": "#aa3939",
+  "danger": "#bc2f34",
   "danger-contrast": "#ffffff",
   "warn": "#a46026",
   "warn-contrast": "#ffffff",
@@ -18,7 +18,7 @@
   "border": "#919191",
   "editor": "vs",
   "text": {
-    "primary": "#333333",
+    "primary": "#323130",
     "secondary": "#666666"
   },
   "breadcrumb": {
@@ -53,16 +53,16 @@
     "disabled-bg": "#ededed"
   },
   "monitorChart": {
-    "core-count": "#1c3f95",
+    "core-count": "#004e8c",
     "low-priority-core-count": "#a36a00",
-    "task-start-event": "#a36a00",
-    "task-complete-event": "#428000",
-    "task-fail-event": "#aa3939",
-    "starting-node-count": "#1c3f95",
-    "idle-node-count": "#be93d9",
-    "running-node-count": "#428000",
-    "start-task-failed-node-count": "#aa3939",
-    "rebooting-node-count": "#ff755c"
+    "task-start-event": "#6d5700",
+    "task-complete-event": "#0f700f",
+    "task-fail-event": "#bc2f34",
+    "starting-node-count": "#004e8c",
+    "idle-node-count": "#8764b8",
+    "running-node-count": "#0f700f",
+    "start-task-failed-node-count": "#bc2f34",
+    "rebooting-node-count": "#d93c20"
   },
   "input": {
     "border": "#919191",
@@ -74,5 +74,5 @@
     "disabled-text": "var(--color-text-primary)",
     "disabled-background": "#e5e5e5"
   },
-  "chart-colors": ["#003f5c", "#aa3939", "#4caf50", "#ffa600"]
+  "chart-colors": ["#003f5c", "#bc2f34", "#4caf50", "#ffa600"]
 }
diff --git a/data/themes/dark.json b/data/themes/dark.json
@@ -14,6 +14,18 @@
     "primary": "#cccccc",
     "secondary": "#a7a8a9"
   },
+  "monitorChart": {
+    "core-count": "#0a95ff",
+    "low-priority-core-count": "#ae8c00",
+    "task-start-event": "#ae8c00",
+    "task-complete-event": "#0a95ff",
+    "task-fail-event": "#f26363",
+    "starting-node-count": "#0a95ff",
+    "idle-node-count": "#c674d2",
+    "running-node-count": "#44a744",
+    "start-task-failed-node-count": "#f26363",
+    "rebooting-node-count": "#db7843"
+  },
   "breadcrumb": {
     "text": "white",
     "background": "#5b5b5b",

diff --git a/src/@batch-flask/ui/form/form-field/form-field.scss b/src/@batch-flask/ui/form/form-field/form-field.scss
@@ -20,14 +20,22 @@ bl-form-field {
 
 
         > .input-prefix, > .input-suffix {
-            background: $input-border-color;
+            background: $secondary-background;
             border: 1px solid $input-border-color;
             height: 26px;
             padding: 0 5px;
             line-height: 26px;
             vertical-align: middle;
             color: $primary-text;
         }
+
+        > .input-prefix {
+            border-right: none;
+        }
+
+        > .input-suffix {
+            border-left: none;
+        }
     }
     .bl-form-field-label {}
 

diff --git a/src/app/components/account/monitoring/monitor-chart/monitor-chart.component.ts b/src/app/components/account/monitoring/monitor-chart/monitor-chart.component.ts
@@ -196,7 +196,8 @@ export class MonitorChartComponent implements OnChanges, OnDestroy {
             },
             tooltips: {
                 enabled: true,
-                mode: "index",
+                mode: "single",
+                position: "nearest",
                 callbacks: {
                     title: (tooltipItems, data) => {
                         return this._computeTooltipTitle(tooltipItems[0], data);

diff --git a/src/app/styles/vendor/material-theme.scss b/src/app/styles/vendor/material-theme.scss
@@ -30,6 +30,11 @@ $mat-theme: mat-light-theme($mat-primary, $mat-accent);
 
 mat-tab-group {
     .mat-tab-label {
+        opacity: 1;
+        color: $secondary-text;
+    }
+
+    .mat-tab-label-active {
         color: $primary-text;
     }
 }
@@ -41,9 +46,6 @@ mat-tab-group:not(.form-tabs) {
         height: 32px;
         line-height: 32px;
 
-        &.mat-tab-label-active {
-        }
-
         &.mat-tab-disabled {
             color: $button-disabled-text-color;
         }