From aba151e0a874c2f9caa344da528646525e21c064 Mon Sep 17 00:00:00 2001
From: shentao <shentao@chinamobile.com>
Date: Wed, 19 Apr 2017 14:46:23 +0800
Subject: modified main page size

Issue-id: CLIENT-175

Change-Id: I110e9d4dad0de901bbf926978625234e2b1284d1
Signed-off-by: shentao <shentao@chinamobile.com>
---
 login/src/main/webapp/login/css/menu_mainStyle.css | 1 +
 login/src/main/webapp/login/html/menu.html         | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'login/src')

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>
-- 
cgit 1.2.3-korg