Repository: incubator-nifi Updated Branches: refs/heads/develop 94a06fc5d -> ad74a4304
NIFI-255: - Removing reset.css from the aggregated/minified css files. This allows is to be referenced from elsewhere. - Copying the tooltip style into the NiFi combo since that should be usable without importing the remainder of the styles in the canvas. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/ad74a430 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ad74a430 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ad74a430 Branch: refs/heads/develop Commit: ad74a4304e11e3a523ea25ab3d9d6c6ac412ee17 Parents: 94a06fc Author: Matt Gilman <[email protected]> Authored: Thu Jan 15 07:59:02 2015 -0500 Committer: Matt Gilman <[email protected]> Committed: Thu Jan 15 07:59:02 2015 -0500 ---------------------------------------------------------------------- .../framework-bundle/framework/web/nifi-web-ui/pom.xml | 11 ++--------- .../src/main/webapp/WEB-INF/pages/bulletin-board.jsp | 1 + .../nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp | 1 + .../src/main/webapp/WEB-INF/pages/cluster.jsp | 1 + .../src/main/webapp/WEB-INF/pages/counters.jsp | 1 + .../src/main/webapp/WEB-INF/pages/history.jsp | 1 + .../src/main/webapp/WEB-INF/pages/provenance.jsp | 1 + .../src/main/webapp/WEB-INF/pages/summary.jsp | 1 + .../src/main/webapp/WEB-INF/pages/templates.jsp | 1 + .../nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp | 1 + .../src/main/webapp/js/jquery/combo/jquery.combo.css | 6 ++++++ .../src/main/webapp/js/jquery/combo/jquery.combo.js | 2 +- 12 files changed, 18 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml index 69e306d..3eee5a0 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/pom.xml @@ -408,7 +408,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-canvas-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/processor-configuration.css</include> <include>${staging.dir}/css/processor-details.css</include> <include>${staging.dir}/css/process-group-configuration.css</include> @@ -438,7 +437,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-history-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -449,7 +447,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-provenance-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -460,7 +457,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-summary-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -474,7 +470,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-counters-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -485,7 +480,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-cluster-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -496,7 +490,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-templates-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -507,7 +500,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-users-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -518,7 +510,6 @@ <insertNewLine>true</insertNewLine> <output>${project.build.directory}/${project.build.finalName}/css/nf-bulletin-board-all.css</output> <includes> - <include>${staging.dir}/css/reset.css</include> <include>${staging.dir}/css/main.css</include> <include>${staging.dir}/css/banner.css</include> <include>${staging.dir}/css/dialog.css</include> @@ -540,6 +531,8 @@ <version>2.5</version> <configuration> <packagingIncludes> + css/reset.css, + css/reset.css.gz, css/message-page.css, css/message-page.css.gz, css/message-pane.css, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp index 62569ef..6df0e51 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp @@ -21,6 +21,7 @@ <title>NiFi Bulletin Board</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.bulletin.board.style.tags} <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index a267913..ba65475 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -21,6 +21,7 @@ <title>NiFi</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.canvas.style.tags} <link rel="stylesheet" href="js/codemirror/lib/codemirror.css" type="text/css" /> <link rel="stylesheet" href="js/codemirror/addon/hint/show-hint.css" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp index 867ea3f..55ffabe 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp @@ -21,6 +21,7 @@ <title>NiFi Cluster</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.cluster.style.tags} <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp index 2d3576d..7362cf2 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp @@ -21,6 +21,7 @@ <title>NiFi Counters</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.counters.style.tags} <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp index db064ff..935512a 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp @@ -21,6 +21,7 @@ <title>NiFi History</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.history.style.tags} <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp index 59e8512..e02a7cd 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp @@ -21,6 +21,7 @@ <title>NiFi Data Provenance</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.provenance.style.tags} <link rel="stylesheet" href="js/jquery/tabbs/jquery.tabbs.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp index be163be..fdfc806 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp @@ -21,6 +21,7 @@ <title>NiFi Summary</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.summary.style.tags} <link rel="stylesheet" href="js/jquery/tabbs/jquery.tabbs.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp index da479d6..126c388 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp @@ -21,6 +21,7 @@ <title>NiFi Templates</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.templates.style.tags} <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp index ff2bbf1..a5f422c 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp @@ -21,6 +21,7 @@ <title>NiFi Users</title> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <link rel="shortcut icon" href="images/nifi16.ico"/> + <link rel="stylesheet" href="css/reset.css" type="text/css" /> ${nf.users.style.tags} <link rel="stylesheet" href="js/jquery/tabbs/jquery.tabbs.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/combo/jquery.combo.css?${project.version}" type="text/css" /> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css index 6d19496..0432340 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css @@ -80,3 +80,9 @@ div.selected-disabled-option { bottom: 0px; z-index: 1999; } + +div.combo-nifi-tooltip { + border: 1px solid #454545; + background-color: #FFFFA3; + color: #454545; +} http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ad74a430/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js index fdcae44..1da075c 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js @@ -203,7 +203,7 @@ $('<img style="float: left; margin-left: 5px; margin-top: 3px;" src="images/iconInfo.png"></img>').appendTo(optionElement).qtip({ content: option.description, style: { - classes: 'nifi-tooltip' + classes: 'combo-nifi-tooltip' }, show: { solo: true,
