caution color cleanup

apache · May 2, 2024 · db444e0 · db444e0
1 parent a3825e6
commit db444e0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 19 deletions.
diff --git a/...bulletins/ui/bulletin-board/bulletin-board-list/_bulletin-board-list.component-theme.scss b/...bulletins/ui/bulletin-board/bulletin-board-list/_bulletin-board-list.component-theme.scss
@@ -26,9 +26,9 @@
     $nifi-theme-caution-palette: map.get($nifi-theme-color-config, 'warn');
 
     // Get hues from palette
-    $nifi-theme-caution-palette-default: mat.get-color-from-palette($nifi-theme-caution-palette);
+    $nifi-theme-caution-palette-darker: mat.get-color-from-palette($nifi-theme-caution-palette, darker);
 
     .bulletin-warn {
-        color: $nifi-theme-caution-palette-default;
+        color: $nifi-theme-caution-palette-darker;
     }
 }
diff --git a/...frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss b/...frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
@@ -45,7 +45,6 @@
     $nifi-theme-success-palette-50: mat.get-color-from-palette($nifi-theme-success-palette, 50);
     $nifi-theme-success-palette-900: mat.get-color-from-palette($nifi-theme-success-palette, 900);
     $material-theme-warn-palette-darker: mat.get-color-from-palette($material-theme-warn-palette, darker);
-    $nifi-theme-caution-palette-default: mat.get-color-from-palette($nifi-theme-caution-palette);
     $nifi-theme-caution-palette-darker: mat.get-color-from-palette($nifi-theme-caution-palette, darker);
 
     // Shadows should always be darker. We explicitly set this so the SVG shadows are correct in both modes.
@@ -338,7 +337,7 @@
         }
 
         g.connection rect.backpressure-percent.warning {
-            fill: $nifi-theme-caution-palette-default;
+            fill: $nifi-theme-caution-palette-darker;
         }
 
         g.connection rect.backpressure-percent.error {

diff --git a/...undle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_app.scss b/...undle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_app.scss
@@ -281,8 +281,6 @@
     $nifi-theme-success-palette-default: mat.get-color-from-palette($nifi-theme-success-palette, default);
     $nifi-theme-success-palette-lighter: mat.get-color-from-palette($nifi-theme-success-palette, lighter);
     $nifi-theme-success-palette-darker: mat.get-color-from-palette($nifi-theme-success-palette, darker);
-    $nifi-theme-caution-palette-default: mat.get-color-from-palette($nifi-theme-caution-palette);
-    $nifi-theme-caution-palette-lighter: mat.get-color-from-palette($nifi-theme-caution-palette, lighter);
     $nifi-theme-caution-palette-darker: mat.get-color-from-palette($nifi-theme-caution-palette, darker);
 
     // semantic classes for contrast colors determined based on the light/dark mode of the theme.
@@ -323,16 +321,6 @@
         fill: $nifi-theme-success-palette-darker;
     }
 
-    .caution-color {
-        color: $nifi-theme-caution-palette-default;
-        fill: $nifi-theme-caution-palette-default;
-    }
-
-    .caution-color-lighter {
-        color: $nifi-theme-caution-palette-lighter;
-        fill: $nifi-theme-caution-palette-lighter;
-    }
-
     .caution-color-darker {
         color: $nifi-theme-caution-palette-darker;
         fill: $nifi-theme-caution-palette-darker;

diff --git a/...undle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/themes/nifi.scss b/...undle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/themes/nifi.scss
@@ -80,9 +80,9 @@ $caution-palette: (
     800: #f7a52f,
     900: #f27d22,
     A100: #ffef85,
-    A200: #f8bf47, // .bulletin-warn
-    A400: #bda500, // g.connection rect.backpressure-percent.warning,
-    A700: #ffcc00, // g.connection.selected rect.border, g.connection path.connection-selection-path, g.connection rect.midpoint, g.label rect.labelpoint
+    A200: #f8bf47,
+    A400: #bda500,
+    A700: #ffcc00,
     contrast: (
         50: rgba(#000000, 0.87),
         100: rgba(#000000, 0.87),