Window height = 540px - fix for bug 11388

3 files changed, 13 insertions, 14 deletions

diff --git a/usr/share/mageiawelcome/css/style.css b/usr/share/mageiawelcome/css/style.css
index 42184e8..af9e8bc 100644
--- a/usr/share/mageiawelcome/css/style.css
+++ b/usr/share/mageiawelcome/css/style.css
@@ -1,12 +1,11 @@
 html {
-    /*font-family: "Droid Sans", sans-serif;*/
-    font-size: 14px;
+      font-size: 14px;
 }
 a:focus, button:focus{outline:none;-webkit-tap-highlight-color: rgba(0, 0, 0, 0);}
 p a.weblink{color:#FFF;font-weight:bold; text-decoration:none;}
 p a.weblink:hover{text-decoration:underline;}
 body {background: #262F45; color:#FFF;margin:0;padding:0;font-size:12px;cursor:default;text-shadow: 1px 0 2px #000;}
-header{/*border-bottom: 1px solid gray;*/padding:0 6px;height:100px;position:relative;color:#FFF; background-image:url('../img/mga_bg.png');
+header{/*border-bottom: 1px solid gray;*/padding:0 6px;height:90px;position:relative;color:#FFF; background-image:url('../img/mga_bg.png');
   background-repeat:no-repeat;
   background-position:98% -20%;}
 h1,h2,ul,div{margin:0;padding:0;}
@@ -19,18 +18,18 @@ header span{font-size:10px;text-shadow: 0 1px 2px #000;margin-left:20px;margin-t
 
 button.cmd {margin-bottom:4px;}
 /* Menu */
-header nav {width:100%;text-align:center;margin-top:4px;z-index:100;cursor: pointer;}
+header nav {width:100%;text-align:center;margin-top:54px;z-index:100;cursor: pointer;float:left;}
 
-#logo {margin-top: -50px;margin-left: -20px;}
+#logo {margin-top: -90px;margin-left: -10px; height:90px;float:left;}
 .taby {margin: 0 auto;z-index:100;}
 section{padding: 0;background-image:url('../img/mga_bg.png');
 background-repeat:no-repeat;
-background-position:98% -77px;height:455px;background-color: #2397D4;}
+background-position:98% -65px;height:405px;background-color: #2397D4;}
 div.tab {margin:0;padding:6px;}
 div.tab nav {width:100%;text-align:center;}
 div#tab-1,div#tab-2{padding:0;}
 /* START */
-.umenu {float:right; width:45%;height:90px;}
+.umenu {float:right; width:40%;height:90px;}
 p#message{margin: 0 }
 div#links {position:absolute; bottom:6px;}
 .mgalinks {text-align:center;}
@@ -48,7 +47,7 @@ div.mgalinks h5{text-align:center;font-weight:normal;text-transform:uppercase;}
 .red{background-color:#CF0404;}
 .blue{background-color:#4096EE;}
 /* First steps */
-.slides li {height:455px; }
+.slides li {height:405px; }
 .icons {margin-left:30px; margin-bottom:12px;}
 .icons li {height: 20px;}
 div#slide-pager{position:absolute; right:0;z-index:20;background:rgba(0, 0, 0, 0.4);padding:6px 3px;margin: 0 -6px 0 0;width:45%;float:right;border-radius: 0 0 0 8px;}
@@ -57,7 +56,7 @@ div#slide-pager li {line-height:14px;margin-left:0;padding:0;}
 div#slide-pager li a{text-shadow:none;color:#DDD;font-size:11px;text-decoration:none;font-weight:normal;}
 div#slide-pager li a.active{text-shadow:none;color:#FFF;font-size:11px;text-decoration:underline;}
 div#slide-pager li a:hover{text-decoration:underline;color:#EEE;}
-.bx-controls-direction {position:absolute;width:88px;top:172px;right:0;}
+.bx-controls-direction {position:absolute;width:88px;top:152px;right:0;}
 .bx-controls-direction a {
     height: 32px;
     margin-top: -16px;
@@ -83,7 +82,7 @@ div#slide-pager li a:hover{text-decoration:underline;color:#EEE;}
 #rpmdrake_info{background:#FFCC00;color:#111;line-height:29px;border-bottom: 1px solid #111;text-align:center;text-shadow: none;}
 div#applist {width:100%;clear:both;padding:0;margin:0;}
 ul.filter, ul.list{float:left;margin-top:0;}
-ul.filter {width: 169px;background: #FFF;margin:0;height:425px;
+ul.filter {width: 169px;background: #FFF;margin:0;height:375px;
 
   
 }
@@ -93,7 +92,7 @@ ul.filter li {display:block;
 }
 ul.filter li.current,ul.filter li.current:hover {background-color: #0A5C93; color: #FFF;}
 ul.filter li:hover {background-color: #e5e5e5; color: #333;}
-ul.list {width: 630px;height:425px; overflow-x:hidden;overflow-y:auto;padding:0;list-style-type:none;border-left:1px solid #262F45;}
+ul.list {width: 630px;height:375px; overflow-x:hidden;overflow-y:auto;padding:0;list-style-type:none;border-left:1px solid #262F45;}
 
 ul.list img.icon {height:32px;width:32px; float:left;margin:6px;}
 ul.list li {width: 660px;height:54px;margin: 0;position:relative;border-bottom:1px solid #262F45;padding:2px;}
diff --git a/usr/share/mageiawelcome/index.html b/usr/share/mageiawelcome/index.html
index 9bef9eb..9754a47 100644
--- a/usr/share/mageiawelcome/index.html
+++ b/usr/share/mageiawelcome/index.html
@@ -155,7 +155,7 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
 		<!-- Slideshow -->
 		<ul class="slides">
 			<li><div class="umenu"></div>
-			<div class="col_6">
+			<div class="col_7">
 			<h2 id="welcome">$welcome $user!</h2>
 			<p id="message">$welcome_msg</p>
 			</div>
diff --git a/usr/share/mageiawelcome/webgui.py b/usr/share/mageiawelcome/webgui.py
index 2d502f7..0e313bc 100644
--- a/usr/share/mageiawelcome/webgui.py
+++ b/usr/share/mageiawelcome/webgui.py
@@ -86,8 +86,8 @@ def launch_browser(html, quit_function=None, echo=True):
     window.set_icon_name('tools-wizard')
     window.set_title(_('Welcome to Mageia!'))
     window.set_position(gtk.WIN_POS_CENTER)
-    window.set_default_size(800, 600)
-    window.set_size_request(800, 600)
+    window.set_default_size(800, 540)
+    window.set_size_request(800, 540)
     window.set_resizable(False)
     window.show_all()