svn commit: r576003 - in /wicket/common/wicket-site-skin/src/main/resources: META-INF/maven/site.vm style/wicket.css

[iv...@apache.org]

Author: ivaynberg
Date: Sat Sep 15 16:45:12 2007
New Revision: 576003

URL: http://svn.apache.org/viewvc?rev=576003&view=rev
Log:
WICKET-941: Patch to fix layout and positioning issues for the maven generated wicket site

Modified:
    wicket/common/wicket-site-skin/src/main/resources/META-INF/maven/site.vm
    wicket/common/wicket-site-skin/src/main/resources/style/wicket.css

Modified: wicket/common/wicket-site-skin/src/main/resources/META-INF/maven/site.vm
URL: http://svn.apache.org/viewvc/wicket/common/wicket-site-skin/src/main/resources/META-INF/maven/site.vm?rev=576003&r1=576002&r2=576003&view=diff
==============================================================================
--- wicket/common/wicket-site-skin/src/main/resources/META-INF/maven/site.vm (original)
+++ wicket/common/wicket-site-skin/src/main/resources/META-INF/maven/site.vm Sat Sep 15 16:45:12 2007
@@ -108,22 +108,22 @@
 <head>
 	<title>Apache Wicket - $title</title>
 	<link href="style/wicket.css" rel="stylesheet" media="screen" />
-	<!--[if lt IE 7]>
-	<link href="style/ie.css" rel="stylesheet" media="screen" />
-	<![endif]-->
 	<link rel="icon" href="favicon.ico" />
 </head>
 <body>
 <div id="container">
 	<div id="header"><a href="http://incubator.apache.org/wicket"><h1 id="logo"><span>Apache Wicket</span></h1></a></div>
+	<div id="contentwrapper">
+		<div id="contentbody">
+			$bodyContent
+		</div>
+	</div>
 	<div id="navigation">
 		#mainMenu( $decoration.body.menus )
 		<div id="clearer"></div>
 		<a href="http://incubator.apache.org/projects/wicket"><h3 id="incubator"><span>Now incubating!</span></h3></a>
 	</div>
-	<div id="contentBody">
-		$bodyContent
-    </div>
+	
 	<div id="clearer"></div>
 	<div id="footer"><span>&copy; Apache Software Foundation</span></div>
 </div>

Modified: wicket/common/wicket-site-skin/src/main/resources/style/wicket.css
URL: http://svn.apache.org/viewvc/wicket/common/wicket-site-skin/src/main/resources/style/wicket.css?rev=576003&r1=576002&r2=576003&view=diff
==============================================================================
--- wicket/common/wicket-site-skin/src/main/resources/style/wicket.css (original)
+++ wicket/common/wicket-site-skin/src/main/resources/style/wicket.css Sat Sep 15 16:45:12 2007
@@ -20,40 +20,44 @@
 	text-decoration : underline;
 }
 
+p, table, h1, h2, h3, h4, h5, h6, h7, div.code {
+	padding-left:25px;
+	padding-right : 1em;
+}
+
+
 /* Containers */
 #container{
-	background:url('bg_container.png');
-	/* De aloude <ie7 fix */	
-	/* filter:progid:DXimageTransform.Microsoft.AlphaimageLoader(src='bg_container.png', sizingMethod='scale'); */
-	width:927px;
-	min-height:100%;
+	background:url('bg_container.png');	
+	width:955px;	
 	margin-left:auto;
-	margin-right:auto;
-	padding-left:28px;
+	margin-right:auto;	
+	min-height: 100%;
 }
 
 #header{
 	background:#e8590a url('logo_graduated.png');
 	width:899px;
+	margin-left: 28px;
 	height:108px;
 }
 
-#content{
-	width:899px;
-	height:auto;
+#contentwrapper {
+	float: left;
+	width: 100%;
 }
 
-p, table, h1, h2, h3, h4, h5, h6, h7, div.code {
-	padding-left:25px;
-	padding-right : 1em;
+#contentbody{
+	margin-left: 250px;
+	padding-right: 30px;
 }
 
+
 #navigation {
 	background:#ffffff url('bg_menu.png') no-repeat 0px -2px;
-	width:172px;
-	min-height:200px;
-	height:auto;
+	width:172px;	
 	float:left;
+	margin-left: -927px;
 	padding-right:50px;
 	padding-top:20px;
 	padding-left : 0px;
@@ -96,14 +100,6 @@
 }
 
 
-#contentbody{
-	background:#ffffff;
-	width:668px;
-	padding-top:20px;
-	height:auto;
-	float:left
-}
-
 h1, h2, .blogHeading {
 	color:#eb5a0a;
 	font-weight:bold;
@@ -142,6 +138,7 @@
 	position : absolute;
 	//top : -9px;
 	margin-top : 0px;
+	top: 0px;
 }
 
 #incubator {
@@ -158,6 +155,7 @@
 	width:899px;
 	margin-top:15px;
 	padding-top:20px;
+	margin-left: 28px;
 }
 
 #clearer{