Repository: nifi Updated Branches: refs/heads/master d45114e48 -> 2a9274704
[NIFI-2559] UI - Controller Service update missing icons This closes #864 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/2a927470 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/2a927470 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/2a927470 Branch: refs/heads/master Commit: 2a92747046b39d7b3f7604258c1d3bb81a9447bd Parents: d45114e Author: Scott Aslan <scottyas...@gmail.com> Authored: Mon Aug 15 13:16:25 2016 -0400 Committer: Oleg Zhurakousky <o...@suitcase.io> Committed: Mon Aug 15 16:27:12 2016 -0400 ---------------------------------------------------------------------- .../src/main/webapp/css/common-ui.css | 14 ++++-- .../src/main/webapp/css/controller-service.css | 16 +++---- .../nifi-web-ui/src/main/webapp/css/login.css | 1 - .../nifi-web-ui/src/main/webapp/css/main.css | 23 +++++++-- .../main/webapp/css/processor-configuration.css | 8 +++- .../css/remote-process-group-configuration.css | 8 +++- .../nifi-web-ui/src/main/webapp/css/shell.css | 16 ------- .../nifi-web-ui/src/main/webapp/css/summary.css | 48 ++++++++++++++++--- .../src/main/webapp/images/iconAlert.png | Bin 1396 -> 0 bytes .../src/main/webapp/images/iconClose.png | Bin 231 -> 0 bytes .../main/webapp/images/iconCollapseChildren.png | Bin 571 -> 0 bytes .../main/webapp/images/iconCollapseParents.png | Bin 645 -> 0 bytes .../src/main/webapp/images/iconCommit.png | Bin 445 -> 0 bytes .../src/main/webapp/images/iconConnection.png | Bin 1517 -> 0 bytes .../src/main/webapp/images/iconDelete.png | Bin 670 -> 0 bytes .../src/main/webapp/images/iconDetails.png | Bin 549 -> 0 bytes .../main/webapp/images/iconExpandChildren.png | Bin 521 -> 0 bytes .../main/webapp/images/iconExpandParents.png | Bin 585 -> 0 bytes .../src/main/webapp/images/iconInfo.png | Bin 550 -> 0 bytes .../src/main/webapp/images/iconInputPort.png | Bin 1842 -> 0 bytes .../src/main/webapp/images/iconOutputPort.png | Bin 1658 -> 0 bytes .../src/main/webapp/images/iconPopOut.png | Bin 217 -> 0 bytes .../src/main/webapp/images/iconPortRemoved.png | Bin 456 -> 0 bytes .../src/main/webapp/images/iconProcessGroup.png | Bin 1314 -> 0 bytes .../src/main/webapp/images/iconProcessor.png | Bin 1446 -> 0 bytes .../webapp/images/iconRemoteProcessGroup.png | Bin 674 -> 0 bytes .../src/main/webapp/images/iconRun.png | Bin 538 -> 0 bytes .../src/main/webapp/images/iconTwistArrow.png | Bin 256 -> 0 bytes .../propertytable/jquery.propertytable.css | 3 +- .../main/webapp/js/nf/canvas/nf-context-menu.js | 2 +- 30 files changed, 94 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css index 9c947d5..9eac226 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css @@ -263,12 +263,18 @@ div.ajax-loading { background-image: url(../images/iconLoading.gif); } -div.ajax-complete { - background-image: url(../images/iconCommit.png); +div.ajax-complete:before { + font-family: FontAwesome; + content: "\f00c"; + font-size: 16px; + color: #70B59A; } -div.ajax-error { - background-image: url(../images/iconDelete.png); +div.ajax-error:before { + font-family: FontAwesome; + content: "\f1f8"; + font-size: 16px; + color: #004849; } .refresh-button { http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css index e6d2cde..d8c3e0d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css @@ -39,10 +39,6 @@ /* controller-service settings */ -#controller-service-configuration .setting-input { - font-size: 11px !important; -} - #controller-service-name { width: 250px; float: left; @@ -82,10 +78,6 @@ ul.referencing-component-listing li { white-space: nowrap; } -div.referencing-component-state { - margin-top: -2px; -} - div.referencing-component-bulletins { float: left; margin-left: 5px; @@ -95,10 +87,16 @@ div.referencing-component-bulletins { display: none; } +div.referencing-component-bulletins:before { + font-family: FontAwesome; + content: "\f24a"; + font-size: 16px; + color: #004849; +} + div.service.expansion-button { float: left; margin-right: 4px; - margin-top: 2px; width: 10px; height: 10px; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css index fbc0de5..ee45bfc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css @@ -54,7 +54,6 @@ left: 0px; padding-top: 100px; padding-left: 100px; - font-family: Verdana, Geneva, sans-serif; z-index: 1300; width: 412px; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css index 782862b..b78a14d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css @@ -57,12 +57,21 @@ div.context-menu-provenance { white-space: normal; } -.collapsed { - background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top left; +.collapsed:before { + font-family: FontAwesome; + content: "\f0da"; + font-size: 16px; + color: #004849; + float: left; + margin-right: 3px; } -.expanded { - background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right; +.expanded:before { + font-family: FontAwesome; + content: "\f0d7"; + font-size: 16px; + color: #004849; + float: left; } #new-template-description { @@ -98,6 +107,12 @@ div.has-errors, div.invalid { color: #ba554a !important; } +div.has-errors:before, div.invalid:before { + font-family: FontAwesome; + content: "\f071"; + color: #ba554a; +} + div.transmitting { float: left; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css index 912d2cc..e03a698 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css @@ -69,7 +69,13 @@ div.processor-configuration-warning-icon { margin-right: 8px; width: 18px; height: 16px; - background-image: url(../images/iconAlert.png); +} + +div.processor-configuration-warning-icon:before { + font-family: FontAwesome; + content: "\f071"; + font-size: 16px; + color: #ba554a; } #auto-terminate-relationship-names { http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css index 44a6027..847bdb7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css @@ -94,7 +94,13 @@ div.remote-port-removed { margin-top: 17px; width: 18px; height: 18px; - background-image: url("../images/iconPortRemoved.png"); +} + +div.remote-port-removed:before { + font-family: FontAwesome; + content: "\f071"; + font-size: 16px; + color: #ba554a; } div.remote-port-edit-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css index 63def4d..50793c3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css @@ -51,28 +51,12 @@ font-size: 16px; } -div.undock-normal { - background: transparent url(../images/iconPopOut.png) no-repeat left; -} - -div.undock-hover { - background: transparent url(../images/iconPopOut.png) no-repeat right; -} - #shell-close-button { float: left; color: #004849; font-size: 16px; } -div.close-normal { - background: transparent url(../images/iconClose.png) no-repeat left; -} - -div.close-hover { - background: transparent url(../images/iconClose.png) no-repeat right; -} - #shell { position: absolute; top: 48px; http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css index a7e234a..3f0e5cf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/summary.css @@ -334,7 +334,6 @@ span.sorted { } #cluster-processor-icon { - background-image: url(../images/iconProcessor.png); width: 28px; height: 26px; float: left; @@ -342,6 +341,13 @@ span.sorted { margin-top: -2px; } +#cluster-processor-icon:before { + font-family: flowfont; + content: "\e808"; + font-size: 16px; + color: #ad9897; +} + #cluster-processor-details { float: left; } @@ -400,7 +406,6 @@ span.sorted { } #cluster-input-port-icon { - background-image: url(../images/iconInputPort.png); background-size: cover; width: 40px; height: 26px; @@ -409,6 +414,13 @@ span.sorted { margin-top: -2px; } +#cluster-input-port-icon:before { + font-family: flowfont; + content: "\e832"; + font-size: 16px; + color: #ad9897; +} + #cluster-input-port-details { float: left; } @@ -467,7 +479,6 @@ span.sorted { } #cluster-output-port-icon { - background-image: url(../images/iconOutputPort.png); background-size: cover; width: 40px; height: 26px; @@ -476,6 +487,13 @@ span.sorted { margin-top: -2px; } +#cluster-output-port-icon:before { + font-family: flowfont; + content: "\e833"; + font-size: 16px; + color: #ad9897; +} + #cluster-output-port-details { float: left; } @@ -534,13 +552,19 @@ span.sorted { } #cluster-remote-process-group-icon { - background-image: url(../images/iconRemoteProcessGroup.png); width: 30px; height: 22px; float: left; margin-right: 5px; } +#cluster-remote-process-group-icon:before { + font-family: flowfont; + content: "\e805"; + font-size: 16px; + color: #ad9897; +} + #cluster-remote-process-group-details { float: left; } @@ -599,7 +623,6 @@ span.sorted { } #cluster-connection-icon { - background-image: url(../images/iconConnection.png); width: 28px; height: 28px; float: left; @@ -607,6 +630,13 @@ span.sorted { margin-top: -4px; } +#cluster-connection-icon:before { + font-family: flowfont; + content: "\e834"; + font-size: 16px; + color: #ad9897; +} + #cluster-connection-details { float: left; } @@ -665,7 +695,6 @@ span.sorted { } #cluster-process-group-icon { - background-image: url(../images/iconProcessGroup.png); width: 29px; height: 20px; float: left; @@ -673,6 +702,13 @@ span.sorted { margin-top: 1px; } +#cluster-process-group-icon:before { + font-family: flowfont; + content: "\e804"; + font-size: 16px; + color: #ad9897; +} + #cluster-process-group-details { float: left; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png deleted file mode 100755 index 5020c31..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconAlert.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png deleted file mode 100755 index b43a46e..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconClose.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png deleted file mode 100755 index 0bcc2a7..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseChildren.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png deleted file mode 100755 index 3494703..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCollapseParents.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png deleted file mode 100755 index cb2e5bb..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconCommit.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png deleted file mode 100755 index 4b6180b..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconConnection.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png deleted file mode 100755 index dc13227..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDelete.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png deleted file mode 100755 index fe6b61f..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconDetails.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png deleted file mode 100755 index 1a118b2..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandChildren.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png deleted file mode 100755 index f653c47..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconExpandParents.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png deleted file mode 100755 index f192ff5..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInfo.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png deleted file mode 100755 index d4efd97..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconInputPort.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png deleted file mode 100755 index f3d8a66..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconOutputPort.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png deleted file mode 100755 index 4335432..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPopOut.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png deleted file mode 100755 index c13a65f..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconPortRemoved.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png deleted file mode 100644 index 4ff5ac5..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessGroup.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png deleted file mode 100755 index 2ca062c..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconProcessor.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png deleted file mode 100755 index 5205470..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRemoteProcessGroup.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png deleted file mode 100755 index 02715e0..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconRun.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png deleted file mode 100755 index 25e4331..0000000 Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/iconTwistArrow.png and /dev/null differ http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css index 4128e32..560ba2e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css @@ -100,7 +100,7 @@ div.string-check-container { div.string-check { width: 12px; height: 12px; - margin-top: 4px; + margin-top: 3px; } span.string-check-label { @@ -110,7 +110,6 @@ span.string-check-label { } div.value pre { - font-family: Verdana, Arial, Helvetica, sans-serif; overflow: hidden; } http://git-wip-us.apache.org/repos/asf/nifi/blob/2a927470/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js index df2870a..6b816b6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js @@ -349,7 +349,7 @@ nf.ContextMenu = (function () { * { * click: refresh (function), * text: 'Start' (string), - * img: 'images/iconRun.png' + * clazz: 'fa fa-refresh' * } * * @param {jQuery} contextMenu The context menu
