diff options
-rw-r--r-- | login/src/main/webapp/login/css/menu_mainStyle.css | 1 | ||||
-rw-r--r-- | login/src/main/webapp/login/html/menu.html | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/login/src/main/webapp/login/css/menu_mainStyle.css b/login/src/main/webapp/login/css/menu_mainStyle.css index ca1af9ed..2988b55b 100644 --- a/login/src/main/webapp/login/css/menu_mainStyle.css +++ b/login/src/main/webapp/login/css/menu_mainStyle.css @@ -177,6 +177,7 @@ a { #page-main-wrapper { margin-left: 240px; + height: 100%; } #page-header { diff --git a/login/src/main/webapp/login/html/menu.html b/login/src/main/webapp/login/html/menu.html index 7a2bb9df..3a715946 100644 --- a/login/src/main/webapp/login/html/menu.html +++ b/login/src/main/webapp/login/html/menu.html @@ -155,8 +155,8 @@ </div> </div> </div> - <div id="rightContainer" style="width:100%; margin-left=240px;"> - <iframe id="mainFrame" name="mainFrame" frameBorder=0 scrolling=no width="100%" onLoad="iFrameHeight()"></iframe> + <div id="rightContainer" style="width:100%; height:100%; margin-left=240px;"> + <iframe id="mainFrame" name="mainFrame" frameBorder="0" scrolling="no" width="100%" height="100%" onload="iFrameHeight()"></iframe> </div> </div> </div> |