You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by sc...@apache.org on 2017/01/19 16:15:35 UTC
nifi git commit: NIFI-3291: - Fixing styles from our usage of jquery
ui autocomplete. - Fixing horizontal scroll bars. - Fixing border around
content repos.
Repository: nifi
Updated Branches:
refs/heads/master 7a2751bf5 -> e62eeb756
NIFI-3291:
- Fixing styles from our usage of jquery ui autocomplete.
- Fixing horizontal scroll bars.
- Fixing border around content repos.
This closes #1429
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/e62eeb75
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/e62eeb75
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/e62eeb75
Branch: refs/heads/master
Commit: e62eeb7563da7486f4dc7925764ed1226fd9dc45
Parents: 7a2751b
Author: Matt Gilman <ma...@gmail.com>
Authored: Wed Jan 18 15:47:08 2017 -0500
Committer: Scott Aslan <sc...@gmail.com>
Committed: Thu Jan 19 11:13:44 2017 -0500
----------------------------------------------------------------------
.../src/main/webapp/css/common-ui.css | 24 +++++++++++++++++++-
.../src/main/webapp/css/counters.css | 4 ++++
.../src/main/webapp/css/flow-status.css | 15 ++++--------
.../nifi-web-ui/src/main/webapp/css/history.css | 4 ++++
.../src/main/webapp/css/policy-management.css | 9 --------
.../src/main/webapp/css/provenance.css | 4 ++++
.../nifi-web-ui/src/main/webapp/css/summary.css | 15 +++++-------
.../src/main/webapp/css/templates.css | 4 ++++
.../nf-ng-canvas-flow-status-controller.js | 2 +-
.../webapp/js/nf/canvas/nf-policy-management.js | 2 +-
.../webapp/js/nf/summary/nf-cluster-search.js | 8 +++++--
11 files changed, 57 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/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 e871537..11622c5 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
@@ -594,7 +594,7 @@ md-progress-linear > div {
font-weight: 500;
}
-.setting-header{
+.setting-header {
color: #728e9b;
font-size: 12pt;
font-family: 'Roboto Slab';
@@ -610,4 +610,26 @@ md-progress-linear > div {
background-color: #fff;
cursor: default;
line-height: normal;
+}
+
+/* jquery ui autocomplete override */
+
+.ui-autocomplete {
+ overflow: auto !important;
+ border: 1px solid #aaaaaa !important;
+ font-size: 12px !important;
+ font-family: Roboto !important;
+}
+
+.ui-menu .ui-menu-item a {
+ display: block;
+ border: 1px solid transparent;
+ line-height: 1.5;
+ margin: 0 !important;
+ color: #333 !important;
+}
+
+.ui-menu .ui-menu-item a.ui-state-active {
+ background: #D4E0E5 !important;
+ border: 1px solid #999999;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css
index 40d240e..40bb153 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css
@@ -73,3 +73,7 @@
right: 0px;
min-height: 150px;
}
+
+#counters-table div.slick-viewport {
+ overflow-x: hidden !important;
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
index b353643..42f9afd 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
@@ -142,20 +142,12 @@ input.search-flow {
#search-flow-results .ui-autocomplete {
max-height: 400px;
- overflow: auto;
- border: 1px solid #aaaaaa;
z-index: 1251;
- border-radius: 0;
-}
-
-#search-flow-results .ui-menu .ui-menu-item a.ui-state-active {
- background: #D4E0E5 !important;
- border: 1px solid #999999;
- border-radius: 0;
}
#search-flow-results li.search-header {
font-weight: bold;
+ color: #222 !important;
padding-top: 4px;
padding-left: 4px;
padding-right: 4px;
@@ -170,8 +162,9 @@ input.search-flow {
#search-flow-results div.search-match {
margin-left: 26px;
color: #888;
- font-size: 10px;
- line-height: 1.4em;
+ font-size: 11px;
+ line-height: 1.4;
+ word-break: break-all;
}
div.search-glass-pane {
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
index d13000d..80d5ffc 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
@@ -156,3 +156,7 @@ div.history-details-name {
right: 0px;
min-height: 150px;
}
+
+#history-table div.slick-viewport {
+ overflow-x: hidden !important;
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
index 71787db..0e92a9c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css
@@ -203,16 +203,7 @@ div.policy-selected-component-type {
#search-users-results .ui-autocomplete {
max-height: 300px;
- overflow: auto;
- border: 1px solid #aaaaaa;
z-index: 1351;
- border-radius: 0;
-}
-
-#search-users-results .ui-menu .ui-menu-item a.ui-state-active {
- background: #D4E0E5 !important;
- border: 1px solid #999999;
- border-radius: 0;
}
div.secure-port-setting {
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
index d787c4b..a1a7ed5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css
@@ -338,6 +338,10 @@ div.content-detail-value {
min-height: 150px;
}
+#provenance-table div.slick-viewport {
+ overflow-x: hidden !important;
+}
+
/* provenance lineage */
#provenance-lineage {
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/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 89b42b9..0ca1678 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
@@ -96,16 +96,7 @@ div.search-match {
#search-cluster-results .ui-autocomplete {
max-height: 300px;
- overflow: auto;
- border: 1px solid #aaaaaa;
z-index: 1351;
- border-radius: 0;
-}
-
-#search-cluster-results .ui-menu .ui-menu-item a.ui-state-active {
- background: #D4E0E5 !important;
- border: 1px solid #999999;
- border-radius: 0;
}
input.search-nodes {
@@ -192,6 +183,8 @@ input.search-nodes {
#content-repository-storage-usage-container {
height: 179px;
overflow-y: scroll;
+ border: 1px solid #ccc;
+ padding: 4px;
}
#content-repository-storage-usage-container div.storage-usage {
@@ -298,6 +291,10 @@ div.summary-table {
min-height: 150px;
}
+div.summary-table div.slick-viewport {
+ overflow-x: hidden !important;
+}
+
span.sorted {
text-decoration: underline;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
index 5dd2210..ab5e940 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
@@ -91,3 +91,7 @@
right: 0px;
min-height: 150px;
}
+
+#templates-table div.slick-viewport {
+ overflow-x: hidden !important;
+}
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
index e8600e7..0db667c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
@@ -84,7 +84,7 @@ nf.ng.Canvas.FlowStatusCtrl = function (serviceProvider) {
},
_resizeMenu: function () {
var ul = this.menu.element;
- ul.width(399);
+ ul.width(400);
},
_normalize: function (searchResults) {
var items = [];
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
index d7a6d8f..dc40c95 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-policy-management.js
@@ -154,7 +154,7 @@ nf.PolicyManagement = (function () {
},
_resizeMenu: function () {
var ul = this.menu.element;
- ul.width($('#search-users-field').outerWidth() - 6);
+ ul.width($('#search-users-field').outerWidth() - 2);
},
_renderUser: function (ul, match) {
var userContent = $('<a></a>').text(match.component.identity);
http://git-wip-us.apache.org/repos/asf/nifi/blob/e62eeb75/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
index 240a4ff..a12b536 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-cluster-search.js
@@ -148,7 +148,7 @@ nf.ClusterSearch = (function () {
var self = this;
$.each(searchResults.nodeResults, function (_, node) {
- self._renderItemData(ul, {
+ self._renderItem(ul, {
label: node.address,
value: node.address
});
@@ -161,7 +161,11 @@ nf.ClusterSearch = (function () {
},
_resizeMenu: function () {
var ul = this.menu.element;
- ul.width($('#cluster-search-field').width() + 6);
+ ul.width($('#cluster-search-field').outerWidth() - 2);
+ },
+ _renderItem: function (ul, match) {
+ var itemContent = $('<a></a>').text(match.label);
+ return $('<li></li>').data('ui-autocomplete-item', match).append(itemContent).appendTo(ul);
}
});