You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/07/21 12:24:54 UTC
nifi git commit: [NIFI-2107] [NIFI-2143] Update content-viewer, error,
and login pages...Fix Provenance filter combo text. This closes #684
Repository: nifi
Updated Branches:
refs/heads/master 5eba2b763 -> f352ea10b
[NIFI-2107] [NIFI-2143] Update content-viewer, error, and login pages...Fix Provenance filter combo text. This closes #684
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f352ea10
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f352ea10
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f352ea10
Branch: refs/heads/master
Commit: f352ea10b7645fa3e58030e49364cfa4c6641ccd
Parents: 5eba2b7
Author: Scott Aslan <ja...@hortonworks.com>
Authored: Wed Jul 20 16:34:50 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Thu Jul 21 08:22:22 2016 -0400
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/jsp/header.jsp | 22 +++++++----
.../src/main/webapp/css/main.css | 39 ++++++++++++-------
.../nifi-web-error/src/main/webapp/index.jsp | 10 +++--
.../src/main/webapp/WEB-INF/pages/login.jsp | 2 +
.../main/webapp/WEB-INF/pages/message-page.jsp | 8 +++-
.../WEB-INF/partials/login/login-form.jsp | 4 +-
.../src/main/webapp/css/common-ui.css | 12 ++++--
.../nifi-web-ui/src/main/webapp/css/login.css | 6 +--
.../nifi-web-ui/src/main/webapp/css/main.css | 4 ++
.../src/main/webapp/css/message-pane.css | 17 ++++----
.../src/main/webapp/css/provenance.css | 3 +-
.../src/main/webapp/css/templates.css | 3 +-
.../src/main/webapp/images/bg-error.png | Bin 63766 -> 13505 bytes
.../webapp/js/jquery/combo/jquery.combo.css | 4 +-
14 files changed, 87 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
index c679c37..dd0b68c 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/WEB-INF/jsp/header.jsp
@@ -21,12 +21,15 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
<title>NiFi</title>
- <link href="css/main.css" rel="stylesheet" type="text/css" />
- <link href="../nifi/css/message-pane.css" rel="stylesheet" type="text/css" />
- <link href="../nifi/css/message-page.css" rel="stylesheet" type="text/css" />
+ <link rel="stylesheet" href="../nifi/css/reset.css" type="text/css" />
+ <link rel="stylesheet" href="css/main.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" />
+ <link rel="stylesheet" href="../nifi/css/message-pane.css" type="text/css" />
+ <link rel="stylesheet" href="../nifi/css/message-page.css" type="text/css" />
<link rel="stylesheet" href="../nifi/js/jquery/combo/jquery.combo.css" type="text/css" />
<link rel="stylesheet" href="../nifi/js/jquery/modal/jquery.modal.css" type="text/css" />
- <link rel="stylesheet" href="../nifi/css/reset.css" type="text/css" />
<script type="text/javascript" src="../nifi/js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="../nifi/js/jquery/jquery.center.js"></script>
<script type="text/javascript" src="../nifi/js/jquery/combo/jquery.combo.js"></script>
@@ -43,6 +46,11 @@
overlayBackground: false,
buttons: [{
buttonText: 'Ok',
+ color: {
+ base: '#728E9B',
+ hover: '#004849',
+ text: '#ffffff'
+ },
handler: {
click: function () {
$$('#content-viewer-message-dialog').modal('hide');
@@ -146,8 +154,8 @@
<div id="content-viewer-message"></div>
</div>
</div>
- <div id="view-as-label">View as</div>
+ <div id="view-as-label">View as:</div>
<div id="view-as" class="pointer button-normal"></div>
- <div id="content-filename"><span class="content-label">filename</span><%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %></div>
- <div id="content-type"><span class="content-label">content type</span><%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %></div>
+ <div id="content-filename"><span class="content-label">Filename:</span><%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %></div>
+ <div id="content-type"><span class="content-label">Content Type:</span><%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %></div>
<div class="message-pane-message-box">
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/css/main.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/css/main.css
index 6e83c76..698e0ff 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/css/main.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-content-viewer/src/main/webapp/css/main.css
@@ -30,37 +30,50 @@
#view-as-label {
position: absolute;
top: 72px;
- left: 144px;
- line-height: 24px;
+ left: 100px;
+ line-height: 30px;
font-size: 12px;
+ font-weight: normal;
+ font-family: Roboto Slab;
+ color: #262626;
}
#view-as {
- position: absolute;
+ position: relative;
top: 72px;
- left: 200px;
- width: 80px;
- height: 18px;
+ left: 150px;
}
#content-filename {
position: absolute;
- top: 58px;
+ top: 62px;
right: 50px;
- line-height: 24px;
- font-size: 12px;
+ line-height: normal;
+ color: #775351;
+ font-size: 13px;
+ font-style: normal;
+ font-weight: 500;
+ font-family: 'Roboto';
}
#content-type {
position: absolute;
- top: 75px;
+ top: 79px;
right: 50px;
- line-height: 24px;
- font-size: 12px;
+ line-height: normal;
+ color: #775351;
+ font-size: 13px;
+ font-style: normal;
+ font-weight: 500;
+ font-family: 'Roboto';
}
.content-label {
- font-weight: bold;
+ font-size: 12px;
+ font-weight: 500;
+ font-family: Roboto Slab;
+ padding-bottom: 4px;
+ color: #262626;
margin-right: 8px;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
index 3a342fb..715ba2b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-error/src/main/webapp/index.jsp
@@ -20,10 +20,14 @@
<% String contextPath = "/".equals(request.getContextPath()) ? "" : request.getContextPath(); %>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <link rel="shortcut icon" href="../nifi/images/nifi16.ico"/>
+ <link rel="shortcut icon" href="<%= contextPath %>/nifi/images/nifi16.ico"/>
<title>NiFi</title>
- <link href="<%= contextPath %>/nifi/css/message-pane.css" rel="stylesheet" type="text/css" />
- <link href="<%= contextPath %>/nifi/css/message-page.css" rel="stylesheet" type="text/css" />
+ <link rel="stylesheet" href="<%= contextPath %>/nifi/css/reset.css" type="text/css" />
+ <link rel="stylesheet" href="<%= contextPath %>/nifi/css/common-ui.css" type="text/css" />
+ <link rel="stylesheet" href="<%= contextPath %>/nifi/fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="<%= contextPath %>/nifi/assets/font-awesome/css/font-awesome.min.css" type="text/css" />
+ <link rel="stylesheet" href="<%= contextPath %>/nifi/css/message-pane.css" type="text/css" />
+ <link rel="stylesheet" href="<%= contextPath %>/nifi/css/message-page.css" type="text/css" />
</head>
<body class="message-pane">
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/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 2e2c713..28a417e 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
@@ -22,6 +22,8 @@
<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="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" />
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/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 b0ba026..49c7def 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,8 +21,12 @@
<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 href="/nifi/css/message-pane.css" rel="stylesheet" type="text/css" />
- <link href="/nifi/css/message-page.css" rel="stylesheet" type="text/css" />
+ <link rel="stylesheet" href="/nifi/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" />
+ <link rel="stylesheet" href="/nifi/css/message-pane.css" type="text/css" />
+ <link rel="stylesheet" href="/nifi/css/message-page.css" type="text/css" />
</head>
<body class="message-pane">
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
index f8f06f3..eddf76d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/login/login-form.jsp
@@ -20,13 +20,13 @@
<div class="setting">
<div class="setting-name">Username</div>
<div class="setting-field">
- <input type="text" id="username"/>
+ <input type="text" placeholder="username" id="username"/>
</div>
</div>
<div class="setting">
<div class="setting-name">Password</div>
<div class="setting-field">
- <input type="password" id="password"/>
+ <input type="password" placeholder="password" id="password"/>
</div>
</div>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/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 52f6162..00b3174 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
@@ -100,7 +100,6 @@ i[class^="icon-"]:before, i[class*=" icon-"]:before {
body {
display: block;
font-family: Roboto, sans-serif;
- font-size: 62.5%;
overflow: hidden;
color: #262626;
}
@@ -338,7 +337,7 @@ input:focus {
.filter-container {
height: 32px;
- width: 318px;
+ width: 100%;
float: left;
}
@@ -352,7 +351,6 @@ input.filter {
}
.filter-type {
- width: 120px;
float: left;
}
@@ -492,4 +490,12 @@ md-progress-linear > div {
font-weight: bold;
padding-bottom: 20px;
text-overflow: ellipsis;
+}
+
+.CodeMirror {
+ border: 1px solid #aaa;
+ font-family: monospace;
+ background-color: #fff;
+ cursor: default;
+ line-height: normal;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
index 112f8f8..1c16d13 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/login.css
@@ -26,7 +26,6 @@
bottom: 0px;
right: 0px;
background: #fff url(../images/bg-error.png) left top no-repeat;
- font-family: Verdana, Geneva, sans-serif;
padding-top: 100px;
padding-left: 100px;
}
@@ -42,10 +41,11 @@
}
.login-title {
- font-size: 12px;
+ font-size: 18px;
font-weight: bold;
+ font-family: Roboto Slab;
margin-bottom: 10px;
- color: #000;
+ color: #728e9b;
}
#login-user-links-container {
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
index 0fa0177..8999258 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
@@ -15,6 +15,10 @@
* limitations under the License.
*/
+body {
+ font-size: 62.5%;
+}
+
#splash {
position: absolute;
top: 0px;
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/message-pane.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/message-pane.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/message-pane.css
index 6aad6da..6269a3f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/message-pane.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/message-pane.css
@@ -20,25 +20,26 @@
left: 0px;
bottom: 0px;
right: 0px;
- background: #d1dee5 url(../images/bg-error.png) left top no-repeat;
- font-family: Verdana, Geneva, sans-serif;
- color: #191919;
+ background: #ffffff url(../images/bg-error.png) left top no-repeat;
z-index: 999999;
}
.message-pane-content {
- font-size: 11px;
- color: #191919;
+ font-size: 12px;
+ color: #262626;
line-height: normal;
}
.message-pane-message-box {
- margin-top: 100px;
+ margin-top: 72px;
padding-left: 100px;
}
.message-pane-title {
- font-size: 18px;
- color: #294c58;
margin-bottom: 16px;
+ color: #728e9b;
+ font-size: 16px;
+ font-family: 'Roboto Slab';
+ font-style: normal;
+ font-weight: bold;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/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 b9f7888..c2a1444 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
@@ -80,7 +80,7 @@ div.provenance-panel {
#provenance-filter-container {
height: 24px;
- width: 326px;
+ width: 100%;
}
#provenance-filter {
@@ -94,7 +94,6 @@ input.provenance-filter-list {
}
#provenance-filter-type {
- width: 128px;
float: left;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/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 2893d8a..4f7c794 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
@@ -68,7 +68,7 @@
#templates-filter-container {
height: 32px;
- width: 318px;
+ width: 100%;
}
#templates-filter {
@@ -82,7 +82,6 @@ input.templates-filter-list {
}
#templates-filter-type {
- width: 120px;
float: left;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bg-error.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bg-error.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bg-error.png
old mode 100755
new mode 100644
index c279553..39209f5
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bg-error.png and b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bg-error.png differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/f352ea10/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css
----------------------------------------------------------------------
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 b75f2fc..9983ea2 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
@@ -25,8 +25,8 @@
padding:0 10px;
height: 30px;
line-height: 30px;
- border-top: 1px solid #eaeef0;
- border-bottom: 1px solid #eaeef0;
+ border: 1px solid #eaeef0;
+ width: 148px;
}
.combo-options {