Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 4ce7202d9 -> 6457929b2
NIFI-250: - Updating fill color dialog styling for use in updated modal plugin. - Making the fill color dialog draggable. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/e4e61daa Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/e4e61daa Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/e4e61daa Branch: refs/heads/NIFI-250 Commit: e4e61daa26c996d3234982cf1409bb501631b9d0 Parents: 4ce7202 Author: Matt Gilman <[email protected]> Authored: Tue Feb 17 12:48:39 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Tue Feb 17 12:48:39 2015 -0500 ---------------------------------------------------------------------- .../nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css | 1 - .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e4e61daa/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css index 9635f8a..88555e7 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css @@ -74,7 +74,6 @@ display: none; width: 195px; height: 400px; - border: 1px solid #eee; } #fill-color-value { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e4e61daa/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js index bfe7312..53b7cc9 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js @@ -213,6 +213,9 @@ nf.CanvasHeader = (function () { $('#fill-color').minicolors('value', ''); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); // initialize the fill color picker
