From 7d1fb09d488ee3301af32b764069d26106cd8645 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Wed, 3 Aug 2016 17:19:50 -0400 Subject: [PATCH] addressing some inconsistencies --- .../partials/canvas/settings-content.jsp | 2 +- .../partials/provenance/provenance-content.jsp | 2 +- .../src/main/webapp/css/common-ui.css | 3 +++ .../webapp/css/process-group-configuration.css | 2 -- .../src/main/webapp/css/settings.css | 18 +++++++++++------- .../webapp/js/jquery/combo/jquery.combo.css | 1 + .../js/nf/provenance/nf-provenance-table.js | 7 +++---- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp index 48854f1b76..8650bb7f01 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp @@ -20,10 +20,10 @@
-
+
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp index 10bf887caa..ade603a973 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp @@ -31,7 +31,7 @@ Oldest event available: 
- +
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 3a5c793c8c..cf3576e569 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 @@ -369,6 +369,7 @@ button.fa { color: #004849; font-size: 16px; cursor: pointer; + line-height: 23px; } button.icon { @@ -530,6 +531,7 @@ md-progress-linear > div { font-size: 12px; font-weight: 500; font-family: Roboto Slab; + text-transform: capitalize; padding-bottom: 4px; color: #262626; } @@ -549,6 +551,7 @@ md-progress-linear > div { width: 100%; color: #775351; font-size: 13px; + font-weight: 500; } .setting-header{ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css index 03c49cd3af..b1bfcb7522 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css @@ -70,8 +70,6 @@ /* general */ #general-process-group-configuration input, #general-process-group-configuration textarea { - font-size: 11px !important; - font-family: Verdana; width: 350px; vertical-align: middle; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css index d2f5ea48e8..304cafaaba 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css @@ -41,9 +41,7 @@ div.settings-container { } #new-service-or-task { - position: absolute; - top: 0px; - right: 0px; + float: right; } #settings-refresh-container { @@ -60,7 +58,7 @@ div.settings-tabs { } #settings-tabs-content { - top: 53px; + top: 43px; bottom: 48px; } @@ -93,14 +91,12 @@ div.settings-refresh-button { } #settings-last-refreshed { - font-weight: bold; + font-weight: 500; } /* general */ #general-settings input { - font-size: 11px !important; - font-family: Verdana; width: 350px; vertical-align: middle; } @@ -116,3 +112,11 @@ div.settings-buttons { div.settings-buttons div.button { float: left; } + +#reporting-tasks-tab-content { + top: 32px; +} + +#controller-services-tab-content { + top: 32px; +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css index 8df72b961b..67ad4990a0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css @@ -64,6 +64,7 @@ white-space: nowrap; text-overflow: ellipsis; width: 80%; + font-weight: normal; } div.selected-disabled-option { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js index 2eb6e02f4a..d80d625184 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js @@ -27,7 +27,6 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { maxResults: 1000, defaultStartTime: '00:00:00', defaultEndTime: '23:59:59', - filterText: 'Filter', styles: { filterList: 'provenance-filter-list', hidden: 'hidden' @@ -521,13 +520,13 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { applyFilter(); }).focus(function () { if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); + $(this).removeClass(config.styles.filterList); } }).blur(function () { if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); + $(this).addClass(config.styles.filterList); } - }).addClass(config.styles.filterList).val(config.filterText); + }).addClass(config.styles.filterList); // filter options var filterOptions = [{