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 c679c3791f..dd0b68c4ab 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 @@ NiFi - - - + + + + + + + - @@ -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 @@
-
View as
+
View as:
-
filename<%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %>
-
content type<%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %>
+
Filename:<%= request.getAttribute("filename") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("filename").toString()) %>
+
Content Type:<%= request.getAttribute("contentType") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("contentType").toString()) %>
\ No newline at end of file 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 6e83c76980..698e0ff347 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; } 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 3a342fb093..715ba2b755 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(); %> - + NiFi - - + + + + + + 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 2e2c713cbb..28a417e620 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 @@ + + ${nf.login.style.tags} 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 b0ba026e69..49c7def981 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 @@ <%= request.getAttribute("title") == null ? "" : org.apache.nifi.util.EscapeUtils.escapeHtml(request.getAttribute("title").toString()) %> - - + + + + + + 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 f8f06f3e3e..eddf76d670 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 @@
Username
- +
Password
- +
\ No newline at end of file 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 52f6162249..00b3174816 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 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 112f8f8d43..1c16d13204 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 { 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 0fa0177203..8999258dd5 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; 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 6aad6da0b4..6269a3fdb1 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 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 b9f78888f8..c2a1444553 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; } 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 2893d8aff1..4f7c794ae9 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; } 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 c27955338f..39209f5b01 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 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 b75f2fc070..9983ea2dc9 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 {