This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 72f6d8a680 [NIFI-12747] correct theming references (#8364)
72f6d8a680 is described below
commit 72f6d8a6800c643d5f283ae9bff6d7de25b503e9
Author: Scott Aslan <[email protected]>
AuthorDate: Tue Feb 6 16:08:01 2024 -0500
[NIFI-12747] correct theming references (#8364)
This closes #8364
---
...dd-tenant-to-policy-dialog.component-theme.scss | 6 ++---
.../ui/canvas/_canvas.component-theme.scss | 15 ++++++------
.../_navigation-control.component-theme.scss | 5 ++--
.../_operation-control.component-theme.scss | 5 ++--
.../_new-canvas-item.component-theme.scss | 5 ++--
.../header/search/_search.component-theme.scss | 2 +-
.../_create-process-group.component-theme.scss | 6 ++---
.../_provenance-event-table.component-theme.scss | 6 ++---
.../lineage/_lineage.component-theme.scss | 6 ++---
.../_context-menu.component-theme.scss | 7 +++---
.../navigation/_navigation.component-theme.scss | 7 +++---
.../nf-editor/_nf-editor.component-theme.scss | 7 +++++-
.../_property-hint-tip.component-theme.scss | 8 +++----
.../src/assets/styles/_listing-table-theme.scss | 7 +++---
.../src/main/nifi/src/styles.scss | 27 +++++++++++-----------
15 files changed, 66 insertions(+), 53 deletions(-)
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss
index 09cdf1c0b0..2476207bdd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/_add-tenant-to-policy-dialog.component-theme.scss
@@ -23,14 +23,14 @@
$color-config: mat.get-color-config($theme);
// Get the color palette from the color-config.
- $primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
// Get hues from palette
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
.add-tenant-to-policy-form {
.fa {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
index 0d585b4739..5dee394e99 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/_canvas.component-theme.scss
@@ -25,6 +25,7 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$warn-palette: map.get($color-config, 'warn');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
$canvas-accent-palette: map.get($canvas-color-config, 'accent');
@@ -33,8 +34,8 @@
$primary-palette-100: mat.get-color-from-palette($primary-palette, 100);
$primary-palette-200: mat.get-color-from-palette($primary-palette, 200);
$primary-palette-500: mat.get-color-from-palette($primary-palette, 500);
- $primary-palette-A200: mat.get-color-from-palette($primary-palette,
'A200');
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A200: mat.get-color-from-palette($accent-palette, 'A200');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
$canvas-primary-palette-200:
mat.get-color-from-palette($canvas-primary-palette, 200);
$canvas-primary-palette-300:
mat.get-color-from-palette($canvas-primary-palette, 300);
@@ -167,7 +168,7 @@
}
g.component.selected rect.border {
- stroke: $primary-palette-A400 !important;
+ stroke: $accent-palette-A400 !important;
}
text.stats-label {
@@ -219,7 +220,7 @@
}
text.add-connect {
- fill: $primary-palette-A400;
+ fill: $accent-palette-A400;
}
/*
@@ -325,7 +326,7 @@
}
text.load-balance-icon-active {
- fill: $primary-palette-A200;
+ fill: $accent-palette-A200;
}
text.connection-from-run-status.is-missing-port,
@@ -515,7 +516,7 @@
}
text.remote-process-group-uri {
- fill: $primary-palette-A400;
+ fill: $accent-palette-A400;
}
rect.remote-process-group-banner {
@@ -527,7 +528,7 @@
}
text.remote-process-group-transmission-secure {
- fill: $primary-palette-A400;
+ fill: $accent-palette-A400;
}
text.remote-process-group-last-refresh {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/_navigation-control.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/_navigation-control.component-theme.scss
index c9427ca039..48c907926f 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/_navigation-control.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/_navigation-control.component-theme.scss
@@ -25,12 +25,13 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
// Get hues from palette
$primary-palette-100: mat.get-color-from-palette($primary-palette, 100);
$primary-palette-300: mat.get-color-from-palette($primary-palette, 300);
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
$canvas-primary-palette-600:
mat.get-color-from-palette($canvas-primary-palette, 600);
$canvas-primary-palette-A100:
mat.get-color-from-palette($canvas-primary-palette, 'A100');
@@ -45,7 +46,7 @@
.fa,
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
.navigation-control-header {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/_operation-control.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/_operation-control.component-theme.scss
index 511f397412..a562bf3a09 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/_operation-control.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/_operation-control.component-theme.scss
@@ -25,6 +25,7 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$warn-palette: map.get($color-config, 'warn');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
@@ -32,7 +33,7 @@
$primary-palette-100: mat.get-color-from-palette($primary-palette, 100);
$primary-palette-300: mat.get-color-from-palette($primary-palette, 300);
$primary-palette-700: mat.get-color-from-palette($primary-palette, 700);
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$warn-palette-A200: mat.get-color-from-palette($warn-palette, 'A200');
$warn-palette-A400: mat.get-color-from-palette($warn-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
@@ -49,7 +50,7 @@
.fa,
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
.operation-control-header {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/_new-canvas-item.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/_new-canvas-item.component-theme.scss
index 7c86b143fd..eb7e240fd8 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/_new-canvas-item.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/_new-canvas-item.component-theme.scss
@@ -25,17 +25,18 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
// Get hues from palette
$primary-palette-100: mat.get-color-from-palette($primary-palette, 100);
$primary-palette-300: mat.get-color-from-palette($primary-palette, 300);
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
.new-canvas-item {
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
&.hovering {
background-color: $primary-palette-100;
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/_search.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/_search.component-theme.scss
index ff73df19fe..448531fe62 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/_search.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/_search.component-theme.scss
@@ -32,7 +32,7 @@
$canvas-primary-palette-900:
mat.get-color-from-palette($canvas-primary-palette, 900);
$canvas-primary-palette-A200:
mat.get-color-from-palette($canvas-primary-palette, 'A200');
$canvas-primary-palette-A700:
mat.get-color-from-palette($canvas-primary-palette, 'A700');
- $canvas-primary-palette-contrast-300:
mat.get-color-from-palette($canvas-primary-palette, 'contrast-300');
+ $canvas-primary-palette-contrast-300:
mat.get-color-from-palette($canvas-primary-palette, '300-contrast');
.search-container {
border-left: 1px solid $primary-palette-300;
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss
index def49ce033..86883fb2fa 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/_create-process-group.component-theme.scss
@@ -23,16 +23,16 @@
$color-config: mat.get-color-config($theme);
// Get the color palette from the color-config.
- $primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
// Get hues from palette
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
// Get hues from palette
.create-process-group-form {
.upload-flow-definition {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/_provenance-event-table.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/_provenance-event-table.component-theme.scss
index 9d88b7000c..6a46994c09 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/_provenance-event-table.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/_provenance-event-table.component-theme.scss
@@ -24,11 +24,11 @@
$canvas-color-config: mat.get-color-config($canvas-theme);
// Get the color palette from the color-config.
- $primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
// Get hues from palette
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-600:
mat.get-color-from-palette($canvas-primary-palette, 600);
$canvas-primary-palette-700:
mat.get-color-from-palette($canvas-primary-palette, 700);
@@ -40,7 +40,7 @@
.lineage-controls {
.fa,
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/_lineage.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/_lineage.component-theme.scss
index df08cfd6c1..58d8249e43 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/_lineage.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/_lineage.component-theme.scss
@@ -24,13 +24,13 @@
$canvas-color-config: mat.get-color-config($canvas-theme);
// Get the color palette from the color-config.
- $primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$warn-palette: map.get($color-config, 'warn');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
$canvas-accent-palette: map.get($canvas-color-config, 'accent');
// Get hues from palette
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$warn-palette-400: mat.get-color-from-palette($warn-palette, 400);
$warn-palette-A200: mat.get-color-from-palette($warn-palette, 'A200');
$canvas-primary-palette-A200:
mat.get-color-from-palette($canvas-primary-palette, 'A200');
@@ -57,7 +57,7 @@
g.flowfile circle.context,
g.event circle.context {
- stroke: $primary-palette-A400;
+ stroke: $accent-palette-A400;
}
.flowfile-icon {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/_context-menu.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/_context-menu.component-theme.scss
index 18a9bbf68d..c0738622bd 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/_context-menu.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/_context-menu.component-theme.scss
@@ -25,13 +25,14 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
$canvas-accent-palette: map.get($canvas-color-config, 'accent');
// Get hues from palette
$primary-palette-50: mat.get-color-from-palette($primary-palette, 50);
$primary-palette-200: mat.get-color-from-palette($primary-palette, 200);
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
$canvas-primary-palette-300:
mat.get-color-from-palette($canvas-primary-palette, 300);
$canvas-primary-palette-A200:
mat.get-color-from-palette($canvas-primary-palette, 'A200');
@@ -39,9 +40,9 @@
div.context-menu {
background-color: $primary-palette-50;
- border: 1px solid $primary-palette-A400;
+ border: 1px solid $accent-palette-A400;
box-shadow: 0 3px 6px $canvas-primary-palette-50;
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
.context-menu-item {
.context-menu-item-text {
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/navigation/_navigation.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/navigation/_navigation.component-theme.scss
index 0ac54c7d1b..f6b8bc4489 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/navigation/_navigation.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/navigation/_navigation.component-theme.scss
@@ -25,12 +25,13 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
// Get hues from palette
$primary-palette-100: mat.get-color-from-palette($primary-palette, 100);
$primary-palette-300: mat.get-color-from-palette($primary-palette, 300);
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
$canvas-primary-palette-A200:
mat.get-color-from-palette($canvas-primary-palette, 'A200');
@@ -38,7 +39,7 @@
background-color: $primary-palette-300;
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
.current-user {
@@ -54,7 +55,7 @@
button.global-menu-item {
.fa,
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/_nf-editor.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/_nf-editor.component-theme.scss
index ec0ccf4b18..895d4a1a9e 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/_nf-editor.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/_nf-editor.component-theme.scss
@@ -33,7 +33,8 @@
$canvas-primary-palette-100:
mat.get-color-from-palette($canvas-primary-palette, 100);
$canvas-primary-palette-200:
mat.get-color-from-palette($canvas-primary-palette, 200);
$canvas-primary-palette-300:
mat.get-color-from-palette($canvas-primary-palette, 300);
- $canvas-primary-palette-contrast-900:
mat.get-color-from-palette($canvas-primary-palette, 'contrast-900');
+ $canvas-primary-palette-contrast-200:
mat.get-color-from-palette($canvas-primary-palette, '200-contrast');
+ $canvas-primary-palette-contrast-900:
mat.get-color-from-palette($canvas-primary-palette, '900-contrast');
.property-editor {
@include mat.button-density(-1);
@@ -50,6 +51,10 @@
}
}
+ .CodeMirror-code {
+ color: $canvas-primary-palette-contrast-200;
+ }
+
/*
Override some defaults...
*/
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/_property-hint-tip.component-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/_property-hint-tip.component-theme.scss
index 525c2c00e6..50de631289 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/_property-hint-tip.component-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/_property-hint-tip.component-theme.scss
@@ -23,12 +23,12 @@
$color-config: mat.get-color-config($theme);
// Get the color palette from the color-config.
- $primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
- // Get hues from palette7
- $primary-palette-A700: mat.get-color-from-palette($primary-palette,
'A700');
+ // Get hues from palette
+ $accent-palette-A700: mat.get-color-from-palette($accent-palette, 'A700');
.hint-pattern {
- background-color: $primary-palette-A700;
+ background-color: $accent-palette-A700;
}
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table-theme.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table-theme.scss
index feefd7e767..5f25862957 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table-theme.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table-theme.scss
@@ -25,13 +25,14 @@
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
$canvas-accent-palette: map.get($canvas-color-config, 'accent');
// Get hues from palette
$primary-palette-100: mat.get-color-from-palette($primary-palette, 100);
$primary-palette-500: mat.get-color-from-palette($primary-palette, 500);
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-800:
mat.get-color-from-palette($canvas-primary-palette, 800);
$canvas-primary-palette-900:
mat.get-color-from-palette($canvas-primary-palette, 900);
$canvas-accent-palette-A100:
mat.get-color-from-palette($canvas-accent-palette, 'A100');
@@ -68,14 +69,14 @@
}
.fa {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
width: 10px;
height: 14px;
text-align: center;
}
.icon {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
width: 10px;
text-align: center;
}
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
index f156b10ee1..e5071a5cc5 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/styles.scss
@@ -177,6 +177,7 @@ $appFontPath: '~roboto-fontface/fonts';
// Get the color palette from the color-config.
$primary-palette: map.get($color-config, 'primary');
+ $accent-palette: map.get($color-config, 'accent');
$warn-palette: map.get($color-config, 'warn');
$canvas-primary-palette: map.get($canvas-color-config, 'primary');
$canvas-accent-palette: map.get($canvas-color-config, 'accent');
@@ -185,9 +186,9 @@ $appFontPath: '~roboto-fontface/fonts';
$primary-palette-50: mat.get-color-from-palette($primary-palette, 50);
$primary-palette-200: mat.get-color-from-palette($primary-palette, 200);
$primary-palette-500: mat.get-color-from-palette($primary-palette, 500);
- $primary-palette-A100: mat.get-color-from-palette($primary-palette,
'A100');
- $primary-palette-A200: mat.get-color-from-palette($primary-palette,
'A200');
- $primary-palette-A400: mat.get-color-from-palette($primary-palette,
'A400');
+ $accent-palette-A100: mat.get-color-from-palette($accent-palette, 'A100');
+ $accent-palette-A200: mat.get-color-from-palette($accent-palette, 'A200');
+ $accent-palette-A400: mat.get-color-from-palette($accent-palette, 'A400');
$canvas-primary-palette-50:
mat.get-color-from-palette($canvas-primary-palette, 50);
$canvas-primary-palette-200:
mat.get-color-from-palette($canvas-primary-palette, 200);
$canvas-primary-palette-400:
mat.get-color-from-palette($canvas-primary-palette, 400);
@@ -201,12 +202,12 @@ $appFontPath: '~roboto-fontface/fonts';
$warn-palette-A400: mat.get-color-from-palette($warn-palette, 'A400');
a {
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
text-decoration-color: $primary-palette-200;
}
a:hover {
- text-decoration-color: $primary-palette-A400;
+ text-decoration-color: $accent-palette-A400;
}
.tooltip {
@@ -228,8 +229,8 @@ $appFontPath: '~roboto-fontface/fonts';
}
.enabled {
- color: $primary-palette-A200 !important;
- fill: $primary-palette-A200 !important;
+ color: $accent-palette-A200 !important;
+ fill: $accent-palette-A200 !important;
text-shadow: 0 0 4px $canvas-primary-palette-900;
}
@@ -259,8 +260,8 @@ $appFontPath: '~roboto-fontface/fonts';
}
.transmitting {
- color: $primary-palette-A200 !important;
- fill: $primary-palette-A200 !important;
+ color: $accent-palette-A200 !important;
+ fill: $accent-palette-A200 !important;
text-shadow: 0 0 4px $canvas-primary-palette-900;
}
@@ -291,8 +292,8 @@ $appFontPath: '~roboto-fontface/fonts';
}
.zero {
- color: $primary-palette-A100 !important;
- fill: $primary-palette-A100 !important;
+ color: $accent-palette-A100 !important;
+ fill: $accent-palette-A100 !important;
text-shadow: none !important;
}
@@ -305,11 +306,11 @@ $appFontPath: '~roboto-fontface/fonts';
button.nifi-button {
border: 1px solid $primary-palette-200;
background-color: $primary-palette-50;
- color: $primary-palette-A400;
+ color: $accent-palette-A400;
}
button.nifi-button:hover {
- border-color: $primary-palette-A400;
+ border-color: $accent-palette-A400;
}
button:disabled {
