From 6206f0f008accde44666dedd26f53d243c9053a3 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Tue, 4 Jun 2024 12:08:17 -0500 Subject: [PATCH] [NIFI-13349] align angular material and tailwind typography (#8918) * [NIFI-13349] align angular material and tailwind typography * override default tailwind fontSize configurations to match up with angular material typography configuration * cleanup duplicate style * add text-3xl tailwind configuration * update primary-node-only to use text-sm * replace .refresh-container with text-sm * add comments for $subtitle-2 material typography config * adjust $subtitle-2 font size and line height This closes #8918 --- .../component-access-policies.component.html | 2 +- .../component-access-policies.component.scss | 4 -- .../global-access-policies.component.html | 2 +- .../global-access-policies.component.scss | 4 -- .../bulletin-board-list.component.scss | 4 -- .../bulletin-board.component.html | 2 +- .../cluster/feature/cluster.component.html | 2 +- .../cluster-node-detail-dialog.component.html | 2 +- .../counter-listing.component.html | 2 +- .../pages/error/feature/error.component.html | 4 +- ...nfiguration-history-listing.component.html | 2 +- .../change-color-dialog.component.html | 2 +- .../change-color-dialog.component.scss | 9 --- .../navigation-control.component.html | 2 +- .../navigation-control.component.scss | 5 -- .../operation-control.component.html | 2 +- .../operation-control.component.scss | 5 -- .../flow-status/flow-status.component.scss | 1 - .../new-canvas-item.component.html | 4 +- .../new-canvas-item.component.scss | 2 - .../header/search/search.component.html | 2 +- .../header/search/search.component.scss | 2 - .../import-from-registry.component.scss | 4 -- .../save-version-dialog.component.scss | 4 -- .../create-process-group.component.scss | 4 -- .../edit-processor.component.html | 2 +- .../no-registry-clients-dialog.component.html | 2 +- .../controller-services.component.html | 2 +- .../manage-remote-ports.component.html | 2 +- .../pages/login/feature/login.component.html | 2 +- .../edit-parameter-context.component.html | 2 +- .../parameter-context-listing.component.html | 2 +- .../provenance-event-listing.component.html | 2 +- .../provenance-event-table.component.html | 2 +- .../flowfile-dialog.component.html | 6 +- .../flowfile-dialog.component.scss | 5 -- .../queue-listing.component.html | 2 +- .../feature/route-not-found.component.html | 2 +- .../edit-flow-analysis-rule.component.html | 2 +- .../flow-analysis-rules.component.html | 2 +- ...agement-controller-services.component.html | 2 +- .../edit-parameter-provider.component.html | 2 +- .../parameter-providers.component.html | 2 +- .../edit-registry-client.component.html | 2 +- .../registry-clients.component.html | 2 +- .../edit-reporting-task.component.html | 2 +- .../reporting-tasks.component.html | 2 +- .../cluster-summary-dialog.component.html | 2 +- .../port-status-table.component.html | 2 +- .../connection-status-table.component.html | 2 +- .../process-group-status-table.component.html | 2 +- .../processor-status-table.component.html | 4 +- .../processor-status-table.component.scss | 7 +- ...-process-group-status-table.component.html | 2 +- .../user-listing/user-listing.component.html | 2 +- .../about-dialog/about-dialog.component.html | 6 +- .../cancel-dialog.component.html | 2 +- .../component-context.component.html | 2 +- .../context-menu/context-menu.component.html | 8 ++- .../context-menu/context-menu.component.scss | 18 ++---- .../disable-controller-service.component.html | 6 +- .../edit-controller-service.component.html | 2 +- .../enable-controller-service.component.html | 6 +- .../edit-parameter-dialog.component.scss | 4 -- .../edit-tenant-dialog.component.scss | 4 -- .../extension-creation.component.scss | 7 +- .../navigation/navigation.component.scss | 2 - .../new-map-table-entry-dialog.component.scss | 4 -- .../new-property-dialog.component.scss | 4 -- .../common/ok-dialog/ok-dialog.component.html | 2 +- .../combo-editor/combo-editor.component.scss | 6 -- .../property-verification.component.html | 8 +-- .../provenance-event-dialog.component.html | 12 ++-- .../provenance-event-dialog.component.scss | 4 -- .../status-history.component.html | 2 +- .../system-diagnostics-dialog.component.html | 22 +++---- .../system-diagnostics-dialog.component.scss | 4 -- .../el-function-tip.component.html | 2 +- .../el-function-tip.component.scss | 1 - .../parameter-tip.component.html | 2 +- .../parameter-tip.component.scss | 1 - .../yes-no-dialog.component.html | 2 +- .../apps/nifi/src/assets/styles/_app.scss | 16 ----- .../apps/nifi/src/assets/themes/material.scss | 28 ++++---- .../main/nifi/apps/nifi/tailwind.config.js | 64 ++++++++++++++++++- 85 files changed, 177 insertions(+), 226 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html index 5c0af4ab60..3218ae4265 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html @@ -119,7 +119,7 @@ }
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.scss index da7e185aca..dfd3a63dfd 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.scss @@ -16,10 +16,6 @@ */ .component-access-policies { - a { - font-size: 16px; - } - .policy-select { .mat-mdc-form-field { width: 300px; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.html index 50c825de4c..29cb43daba 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.html @@ -141,7 +141,7 @@
}
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.scss index 59a3503416..75a8201e4d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.scss @@ -16,10 +16,6 @@ */ .global-access-policies { - a { - font-size: 16px; - } - .resource-select { .mat-mdc-form-field { width: 300px; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.scss index c702c43987..b33f7cac34 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.scss @@ -14,7 +14,3 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -.link { - font-size: 16px; -} diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.html index 634734e00b..e6390baa85 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.html @@ -28,7 +28,7 @@ [bulletinBoardItems]="bulletinBoardState.bulletinBoardItems">
-
+
Auto-refresh
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.html index f8bb6ffb4e..6f94eb3dc6 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.html @@ -31,7 +31,7 @@
Node Events
@if (node.events && node.events.length > 0) { -
+
    @for (event of node.events; track event) {
  • {{ event.timestamp }} - {{ event.message }}
    • diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.html index 2720d7b7ee..585a35237c 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.html @@ -31,7 +31,7 @@
}
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/error/feature/error.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/error/feature/error.component.html index 2366b33e2a..cb5c7ea9c2 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/error/feature/error.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/error/feature/error.component.html @@ -18,11 +18,11 @@
@if (errorDetail$ | async; as errorDetail) { -
{{ errorDetail.message }}
+
{{ errorDetail.message }}
 } @else { -
Please check the logs or navigate home and try again.
+
Please check the logs or navigate home and try again.
 }
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html index d703767be9..6f200a9521 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html @@ -110,7 +110,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.html index 7f8de7c74b..b51e538c9f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.html @@ -34,7 +34,7 @@
Processor Name
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.scss index c5708e7c19..b33f7cac34 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.scss @@ -14,12 +14,3 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -.preview { - .processor { - .logo { - .icon { - font-size: 32px; - } - } - } -} diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.html index 5951b15c3a..275e09c68c 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.html @@ -20,7 +20,7 @@
@if (!navigationCollapsed || !shouldDockWhenCollapsed) { -
Navigation
+
Navigation
}
@if (!navigationCollapsed || !shouldDockWhenCollapsed) { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss index 8fe01ec734..dba8f435cb 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss @@ -31,9 +31,4 @@ div.navigation-control { text-align: center; } } - - .navigation-control-title { - font-size: 12px; - letter-spacing: 0.05rem; - } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.html index e56dcddbcc..4e7d800fa6 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.html @@ -20,7 +20,7 @@
@if (!operationCollapsed || !shouldDockWhenCollapsed) { -
Operation
+
Operation
}
@if (!operationCollapsed || !shouldDockWhenCollapsed) { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss index 897ab9e076..63415cd099 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss @@ -31,9 +31,4 @@ div.operation-control { text-align: center; } } - - .operation-control-title { - font-size: 12px; - letter-spacing: 0.05rem; - } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.scss index d072a63497..5414141b19 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.scss @@ -17,7 +17,6 @@ .flow-status { box-sizing: content-box; - font-size: 15px; .fa, .icon { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html index 5ebc6642ab..e530d7f860 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html @@ -22,9 +22,9 @@ [tooltipDisabled]="dragging" [position]="tooltipPosition" [delayClose]="false"> -
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html index c9da258e39..fc553f1063 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html @@ -250,7 +250,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/login/feature/login.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/login/feature/login.component.html index e0439d9acd..00dd864364 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/login/feature/login.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/login/feature/login.component.html @@ -26,7 +26,7 @@ @if (currentUserState$ | async; as userState) { @if (userState.status === 'success') { -
Already logged in. Click home to return to canvas.
+
Already logged in. Click home to return to canvas.
 } @else { diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html index 7be391492e..7237af0fe7 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.html @@ -42,7 +42,7 @@ }
@if (updateStep.failureReason) { -
+
{{ updateStep.failureReason }}
} diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.html index f59e0af84f..9d53f96d74 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.html @@ -39,7 +39,7 @@ (manageAccessPolicies)="navigateToManageComponentPolicies($event)">
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.html index d39c0c0497..38bacfa9b4 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.html @@ -24,7 +24,7 @@
-
FlowFile Details
+
FlowFile Details
UUID
@@ -106,7 +106,7 @@
-
Content Claim
+
Content Claim
-
Attribute Values
+
Attribute Values
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.scss index 930165c811..d1c5e28531 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.scss @@ -19,9 +19,4 @@ .flowfile { @include mat.button-density(-1); - - .flowfile-header { - font-size: 15px; - font-style: normal; - } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.html index 0d9e95a3ac..0737f12947 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.html @@ -34,7 +34,7 @@ }
-
+
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.html index 431f03e206..3c6661c0bd 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.html @@ -51,7 +51,7 @@ (deleteControllerService)="deleteControllerService($event)">
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html index 6dfb136755..fad2e1356a 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html @@ -18,7 +18,7 @@

Edit Parameter Provider
-
+
{{ formatType(request.parameterProvider) }}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.html index aac9cbe6ba..8e1de67546 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.html @@ -49,7 +49,7 @@ (selectParameterProvider)="selectParameterProvider($event)">
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.html index e6e4308b19..a962981d25 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.html @@ -18,7 +18,7 @@

Edit Registry Client
-
+
{{ formatType(request.registryClient) }}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.html index f538f16319..9738cfe9f7 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.html @@ -39,7 +39,7 @@ (deleteRegistryClient)="deleteRegistryClient($event)">
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.html index 56452b0a17..1e482d4d1f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.html @@ -20,7 +20,7 @@
{{ readonly ? 'Reporting Task Details' : 'Edit Reporting Task' }}
-
+
{{ formatType(request.reportingTask) }}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.html index ceec68bea8..b14cccb464 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.html @@ -48,7 +48,7 @@ (startReportingTask)="startReportingTask($event)">
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html index 2fa80f40a5..b67c568507 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.html @@ -71,7 +71,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.html index 510dd6935d..ca34cd260e 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.html @@ -175,7 +175,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.html index 7cd1714109..eaa8c8b109 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.html @@ -242,7 +242,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.html index 9b57e5ddad..b2d402fb5d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.html @@ -357,7 +357,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.html index 1f685b78b1..7076f1f284 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.html @@ -48,7 +48,7 @@
@if (item.processorStatusSnapshot.executionNode === 'PRIMARY') {
P
@@ -276,7 +276,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.scss b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.scss index 05fd689992..813f433cd0 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.scss +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.scss @@ -23,10 +23,9 @@ } .primary-node-only { - font-size: 10px; - line-height: 13px; - width: 14px; - height: 15px; + position: relative; + top: 2px; + height: 16px; border-radius: 8px; float: left; text-align: center; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.html index 3f75669c96..ef007b5966 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.html @@ -183,7 +183,7 @@
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.html index f235a27ebc..6d3a2e050f 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.html @@ -40,7 +40,7 @@
}
-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.html index 6a599ffbd6..d208f780cc 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.html @@ -26,13 +26,13 @@
{{ about.version }}
@if (about.buildTimestamp) { -
{{ about.buildTimestamp }}
+
{{ about.buildTimestamp }}
} @if (about.buildTag && about.buildTag !== 'HEAD') { -
Tagged {{ about.buildTag }}
+
Tagged {{ about.buildTag }}
} @if (about.buildRevision) { -
From {{ about.buildRevision }} on branch {{ about.buildBranch }}
+
From {{ about.buildRevision }} on branch {{ about.buildBranch }}
}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.html index 0c0c5174d4..7977460f7b 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.html @@ -17,7 +17,7 @@

{{ request.title }}

-
{{ request.message }}
+
{{ request.message }}
 diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/component-context/component-context.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/component-context/component-context.component.html index 8f38e485d6..148724d0a7 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/component-context/component-context.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/apps/nifi/src/app/ui/common/component-context/component-context.component.html @@ -17,7 +17,7 @@
-