Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-1879] Update dialog content scrollable styles. This closes #560

This commit is contained in:
Scott Aslan 2016-06-22 00:04:03 -04:00 committed by Matt Gilman
parent 27ff5f9a87
commit 32facaedb4
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp
View File

@ -16,7 +16,7 @@
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-controller-service-dialog" layout="column" class="hidden large-dialog"> <div id="new-controller-service-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content" layout="column"> <div class="dialog-content">
<div layout="row" style="padding-bottom:0"> <div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center"> <div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div> <div class="setting-name">Tag Cloud:</div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
View File

@ -16,7 +16,7 @@
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-processor-dialog" layout="column" class="hidden large-dialog"> <div id="new-processor-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content" layout="column"> <div class="dialog-content">
<div layout="row" style="padding-bottom:0"> <div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center"> <div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div> <div class="setting-name">Tag Cloud:</div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp
View File

@ -16,7 +16,7 @@
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-reporting-task-dialog" layout="column" class="hidden large-dialog"> <div id="new-reporting-task-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content" layout="column"> <div class="dialog-content">
<div layout="row" style="padding-bottom:0"> <div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center"> <div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div> <div class="setting-name">Tag Cloud:</div>

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
View File

@ -81,4 +81,5 @@
position: absolute; position: absolute;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 32px;
} }

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
View File

@ -392,7 +392,7 @@
//resize dialog content //resize dialog content
if (!nfDialog.resizable) { if (!nfDialog.resizable) {
dialogContent.attr('style', 'height:' + dialogContent.attr('style', 'height:' +
(dialog.height() - (dialog.outerHeight() -
dialog.find('.dialog-header').height() - dialog.find('.dialog-header').height() -
dialog.find('.dialog-buttons').height() - dialog.find('.dialog-buttons').height() -
parseInt(dialogContent.css('padding-top'), 10) - parseInt(dialogContent.css('padding-top'), 10) -
@ -401,9 +401,11 @@
if (dialogContent[0].offsetHeight < dialogContent[0].scrollHeight) { if (dialogContent[0].offsetHeight < dialogContent[0].scrollHeight) {
// your element have overflow // your element have overflow
dialogContent.addClass('scrollable'); dialogContent.addClass('scrollable');
dialog.find('.dialog-buttons').css('background', '#eaeef0');
} else { } else {
// your element doesn't have overflow // your element doesn't have overflow
dialogContent.removeClass('scrollable'); dialogContent.removeClass('scrollable');
dialog.find('.dialog-buttons').css('background', '#fff');
} }
} }
}; };