http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp index b8dee0a..1d5f1ab 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp @@ -21,36 +21,36 @@ <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" /> + <link rel="stylesheet" href="assets/reset.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" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/slickgrid/slick.grid.css" type="text/css" /> + <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> - <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.event.drag-2.2.min.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellrangeselector.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.rowselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.autotooltips.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.formatters.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.editors.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/slickgrid/lib/jquery.event.drag-2.3.0.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellrangeselector.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.rowselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.autotooltips.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.formatters.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.editors.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.dataview.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.core.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.grid.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> ${nf.counters.script.tags} </head>
http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp index 88f28fa..f86c5f4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp @@ -21,36 +21,36 @@ <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" /> + <link rel="stylesheet" href="assets/reset.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" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/slickgrid/slick.grid.css" type="text/css" /> + <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> - <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.event.drag-2.2.min.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellrangeselector.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.rowselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.autotooltips.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.formatters.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.editors.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/slickgrid/lib/jquery.event.drag-2.3.0.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellrangeselector.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.rowselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.autotooltips.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.formatters.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.editors.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.dataview.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.core.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.grid.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> ${nf.history.script.tags} </head> http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp index 28a417e..26b6dba 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp @@ -21,23 +21,23 @@ <title>NiFi Login</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" /> + <link rel="stylesheet" href="assets/reset.css/reset.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> ${nf.login.style.tags} <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> - <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.count.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> ${nf.login.script.tags} </head> http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp index 49c7def..100a4ad 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/message-page.jsp @@ -21,7 +21,7 @@ <title><%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %></title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="images/nifi16.ico"/> - <link rel="stylesheet" href="/nifi/css/reset.css" type="text/css" /> + <link rel="stylesheet" href="/nifi/assets/reset.css/reset.css" type="text/css" /> <link rel="stylesheet" href="/nifi/css/common-ui.css" type="text/css" /> <link rel="stylesheet" href="/nifi/fonts/flowfont/flowfont.css" type="text/css" /> <link rel="stylesheet" href="/nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" /> http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp index 0228056..1b053b5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp @@ -21,20 +21,20 @@ <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" /> + <link rel="stylesheet" href="assets/reset.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" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/slickgrid/slick.grid.css" type="text/css" /> + <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> - <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <script type="text/javascript" src="js/d3/d3.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> @@ -42,18 +42,18 @@ <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.event.drag-2.2.min.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellrangeselector.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.rowselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.autotooltips.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.formatters.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.editors.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/slickgrid/lib/jquery.event.drag-2.3.0.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellrangeselector.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.rowselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.autotooltips.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.formatters.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.editors.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.dataview.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.core.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.grid.js"></script> <script type="text/javascript" src="assets/angular/angular.min.js"></script> <script type="text/javascript" src="assets/angular-messages/angular-messages.min.js"></script> <script type="text/javascript" src="assets/angular-resource/angular-resource.min.js"></script> http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp index a70908d..490e42b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp @@ -21,7 +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" /> + <link rel="stylesheet" href="assets/reset.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" /> @@ -31,17 +31,17 @@ <link rel="stylesheet" href="js/codemirror/addon/hint/show-hint.css" type="text/css" /> <link rel="stylesheet" href="js/jquery/nfeditor/jquery.nfeditor.css?${project.version}" type="text/css" /> <link rel="stylesheet" href="js/jquery/nfeditor/languages/nfel.css?${project.version}" type="text/css" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/slickgrid/slick.grid.css" type="text/css" /> + <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> - <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script> <script type="text/javascript" src="js/d3/d3.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/tabbs/jquery.tabbs.js?${project.version}"></script> @@ -50,17 +50,17 @@ <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.event.drag-2.2.min.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellrangeselector.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.rowselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.autotooltips.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.formatters.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.editors.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/slickgrid/lib/jquery.event.drag-2.3.0.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellrangeselector.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.rowselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.autotooltips.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.formatters.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.editors.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.dataview.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.core.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.grid.js"></script> <script type="text/javascript" src="assets/angular/angular.min.js"></script> <script type="text/javascript" src="assets/angular-messages/angular-messages.min.js"></script> <script type="text/javascript" src="assets/angular-resource/angular-resource.min.js"></script> http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp index 0803d22..be0ad6d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp @@ -21,36 +21,36 @@ <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" /> + <link rel="stylesheet" href="assets/reset.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" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/slickgrid/slick.grid.css" type="text/css" /> + <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> - <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.min.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/combo/jquery.combo.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.event.drag-2.2.min.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellrangeselector.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.rowselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.autotooltips.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.formatters.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.editors.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/slickgrid/lib/jquery.event.drag-2.3.0.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellrangeselector.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.rowselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.autotooltips.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.formatters.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.editors.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.dataview.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.core.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.grid.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> ${nf.templates.script.tags} </head> http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp index 28ecd52..6bd353b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/users.jsp @@ -21,20 +21,20 @@ <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" /> + <link rel="stylesheet" href="assets/reset.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" /> <link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" /> - <link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" /> - <link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> - <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="assets/qtip2/dist/jquery.qtip.min.css?" type="text/css" /> + <link rel="stylesheet" href="assets/jquery-ui-dist/jquery-ui.min.css" type="text/css" /> + <link rel="stylesheet" href="assets/slickgrid/slick.grid.css" type="text/css" /> + <link rel="stylesheet" href="css/slick-nifi-theme.css" type="text/css" /> <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <script type="text/javascript" src="js/d3/d3.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> - <script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script> + <script type="text/javascript" src="assets/jquery/dist/jquery.min.js"></script> + <script type="text/javascript" src="assets/jquery-ui-dist/jquery-ui.min.js"></script> <script type="text/javascript" src="js/jquery/jquery.base64.js"></script> <script type="text/javascript" src="js/jquery/jquery.center.js"></script> <script type="text/javascript" src="js/jquery/tabbs/jquery.tabbs.js?${project.version}"></script> @@ -43,17 +43,17 @@ <script type="text/javascript" src="js/jquery/modal/jquery.modal.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/jquery.ellipsis.js"></script> <script type="text/javascript" src="js/jquery/jquery.each.js"></script> - <script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script> - <script type="text/javascript" src="js/jquery/jquery.event.drag-2.2.min.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellrangeselector.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.cellselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.rowselectionmodel.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/plugins/slick.autotooltips.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.formatters.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.editors.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> - <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> + <script type="text/javascript" src="assets/qtip2/dist/jquery.qtip.min.js"></script> + <script type="text/javascript" src="assets/slickgrid/lib/jquery.event.drag-2.3.0.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellrangeselector.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.cellselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.rowselectionmodel.js"></script> + <script type="text/javascript" src="assets/slickgrid/plugins/slick.autotooltips.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.formatters.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.editors.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.dataview.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.core.js"></script> + <script type="text/javascript" src="assets/slickgrid/slick.grid.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> <script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script> ${nf.users.script.tags} http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css index 9922ebc..772bba4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css @@ -14,7 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@import url(reset.css); @import url(processor-configuration.css); @import url(processor-details.css); @import url(process-group-configuration.css); http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/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 c654784..b353643 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 @@ -148,7 +148,7 @@ input.search-flow { border-radius: 0; } -#search-flow-results .ui-menu .ui-menu-item a.ui-state-focus { +#search-flow-results .ui-menu .ui-menu-item a.ui-state-active { background: #D4E0E5 !important; border: 1px solid #999999; border-radius: 0; http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/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 8b90b8d..610fea2 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 @@ -205,7 +205,7 @@ div.policy-selected-component-type { border-radius: 0; } -#search-users-results .ui-menu .ui-menu-item a.ui-state-focus { +#search-users-results .ui-menu .ui-menu-item a.ui-state-active { background: #D4E0E5 !important; border: 1px solid #999999; border-radius: 0; http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reset.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reset.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reset.css deleted file mode 100644 index e649891..0000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/reset.css +++ /dev/null @@ -1,43 +0,0 @@ -/* Browser Reset CSS, Eric Meyer. */ - -html, body, div, span, applet, object, iframe, -h1, h2, h3, h4, h5, h6, p, blockquote, pre, -a, abbr, acronym, address, big, cite, code, -del, dfn, em, font, img, ins, kbd, q, s, samp, -small, strike, strong, sub, sup, tt, var, -dl, dt, dd, ol, ul, li, -fieldset, form, label, legend, -table, caption, tbody, tfoot, thead, tr, th, td { - margin: 0; - padding: 0; - border: 0; - font-weight: inherit; - font-style: inherit; - font-size: 100%; - font-family: inherit; - vertical-align: baseline; -} -body { - line-height: 1; - color: black; - background: transparent; -} -ol, ul { - list-style: none; -} -/* tables still need 'cellspacing="0"' in the markup */ -table { - border-collapse: separate; - border-spacing: 0; -} -caption, th, td { - text-align: left; - font-weight: normal; -} -blockquote:before, blockquote:after, -q:before, q:after { - content: ""; -} -blockquote, q { - quotes: "" ""; -} http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css new file mode 100755 index 0000000..398f9cd --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/slick-nifi-theme.css @@ -0,0 +1,144 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* nifi specific slick grid theme based on the supplied slick-default-theme.css */ + +.slick-header-columns { + color: #fff; + background-color: #728E9B; +} + +.slick-header-column { + background: #728E9B; + color: #fff; + font-weight: bold; + cursor: pointer; +} + +.slick-header-column:hover, .slick-header-column-active { + color: #fff; +} + +.slick-row { + position: absolute; + background: white; + border: 0; + line-height: 22px; +} + +.slick-row:hover { + background-color: #dce3e6 !important; +} + +.slick-cell { + padding-left: 10px; + padding-right: 10px; +} + +.slick-cell.selected { + background-color: #fffbe6; +} + +.slick-row.odd { + background: #f4f6f7; +} + +.slick-cell.invalid { + border-color: #ba554a; +} + +.slickgrid-editor > textarea { + resize: both; +} + +.grid-canvas .slick-cell:first-child{ + border-left: 0; +} + +.slick-viewport .fa { + color: #004849; + line-height: 22px; + margin-top: 0 !important; + width: 12px; + height: 12px; + float: left; + margin-right: 3px !important; +} + +.slick-viewport .icon { + color: #004849; + line-height: 24px; + margin-top: 0 !important; + width: 12px; + height: 12px; + float: left; + margin-right: 3px !important; +} + +.slick-header.ui-state-default, .slick-headerrow.ui-state-default { + font-family: Roboto; + font-weight: 500; + font-size: 12px; + font-style: normal; + border: 0px; +} + +.slick-header-column.ui-state-default { + height: 24px; + line-height: 24px; + border-right: 1px solid #728E9B; +} + +.slick-sortable-placeholder { + background: #728E9B; +} + +.slick-row.ui-widget-content, .slick-row.ui-state-active { + font-family: Roboto; + font-size: 12px; + font-style: normal; + font-weight: normal; + color: #262626; +} + +.slick-cell, .slick-headerrow-column { + border-right: 0; + border-top: 0; + border-left: 1px solid #c7d2d7; + border-bottom: 1px solid #c7d2d7; + padding: 0 2px 6px 10px; +} + +div.status-text { + padding-left: 4px; + line-height: normal; + overflow: hidden; + text-overflow: ellipsis; + float: left; +} + +.slick-sort-indicator { + float: none !important; +} + +.slick-sort-indicator-desc { + background: url(../images/sort-desc.gif) !important; +} + +.slick-sort-indicator-asc { + background: url(../images/sort-asc.gif) !important; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/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 e56b4d7..89b42b9 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 @@ -102,7 +102,7 @@ div.search-match { border-radius: 0; } -#search-cluster-results .ui-menu .ui-menu-item a.ui-state-focus { +#search-cluster-results .ui-menu .ui-menu-item a.ui-state-active { background: #D4E0E5 !important; border: 1px solid #999999; border-radius: 0; http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-asc.gif ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-asc.gif b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-asc.gif new file mode 100755 index 0000000..1788551 Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-asc.gif differ http://git-wip-us.apache.org/repos/asf/nifi/blob/6170f644/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-desc.gif ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-desc.gif b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-desc.gif new file mode 100755 index 0000000..3b31122 Binary files /dev/null and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/sort-desc.gif differ
