Author: heiko.braun(a)jboss.com Date: 2007-06-28 16:22:16 -0400 (Thu, 28 Jun 2007) New Revision: 3759 Modified: projects/wiki/includes/CategoryPage.php projects/wiki/skins/Devmo.php projects/wiki/skins/devmo/css/base.css projects/wiki/skins/devmo/css/wiki.css Log: fixed size layout Modified: projects/wiki/includes/CategoryPage.php =================================================================== --- projects/wiki/includes/CategoryPage.php 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/includes/CategoryPage.php 2007-06-28 20:22:16 UTC (rev 3759) @@ -222,7 +222,7 @@ } function getCategoryTop() { - $r = "<br style=\"clear:both;\"/>\n"; + $r = "<br/>\n"; if( $this->until != '' ) { $r .= $this->pagingLinks( $this->title, $this->nextPage, $this->until, $this->limit ); } elseif( $this->nextPage != '' || $this->from != '' ) { Modified: projects/wiki/skins/Devmo.php =================================================================== --- projects/wiki/skins/Devmo.php 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/skins/Devmo.php 2007-06-28 20:22:16 UTC (rev 3759) @@ -234,28 +234,29 @@ <?php } ?> </div> - </div> - </div><!-- END SIDEBAR --> - - <div id="content"> - <div class="article"> - <a name="top" id="contentTop"></a> - <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> + + + +<div id="content"> + <div class="article"> + <a name="top" id="contentTop"></a> + <?php if($this->data['sitenotice']) { ?><div id="siteNotice"><?php $this->html('sitenotice') ?></div><?php } ?> <h1 class="firstHeading"><?php $this->text('title') ?></h1> - <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> - <div id="contentSub"><?php $this->html('subtitle') ?></div> - <?php if($this->data['undelete']) { ?><div id="contentSub"><?php $this->html('undelete') ?></div><?php } ?> - <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk') ?></div><?php } ?> + <h3 id="siteSub"><?php $this->msg('tagline') ?></h3> + <div id="contentSub"><?php $this->html('subtitle') ?></div> + <?php if($this->data['undelete']) { ?><div id="contentSub"><?php $this->html('undelete') ?></div><?php } ?> + <?php if($this->data['newtalk'] ) { ?><div class="usermessage"><?php $this->html('newtalk') ?></div><?php } ?> - <?php $this->html('bodytext') ?> - <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php $this->html('catlinks') ?></div><?php } ?> + <?php $this->html('bodytext') ?> + <?php if($this->data['catlinks']) { ?><div id="catlinks"><?php $this->html('catlinks') ?></div><?php } ?> - </div> - </div> <!-- end id content --> + </div> +</div> <!-- END content --> - +</div> <!-- END Page --> + <div id="footer"> <ul> <?php if($this->data['lastmod' ]) { ?><li id="f-lastmod"><?php $this->html('lastmod') ?></li><?php } ?> @@ -268,8 +269,8 @@ <?php if($this->data['about' ]) { ?><li id="f-about"><?php $this->html('about') ?></li><?php } ?> <?php if($this->data['tagline']) { ?><li id="f-tagline"><?php echo $this->data['tagline'] ?></li><?php } ?> </ul> - </div> - </div> <!-- end id page --> + </div><!-- END footer --> + </div> <!-- end id container --> <?php $this->html('reporttime') ?> Modified: projects/wiki/skins/devmo/css/base.css =================================================================== --- projects/wiki/skins/devmo/css/base.css 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/skins/devmo/css/base.css 2007-06-28 20:22:16 UTC (rev 3759) @@ -17,7 +17,7 @@ background-color:#fff; background-image:url("images/bkgheader_left.gif"); background-repeat:repeat-x; - font-size: 0.9em; + font-size: 0.9em; color: #333; } @@ -28,14 +28,15 @@ } #container { - width: 100%; - margin: 0px auto; + margin: 0px auto; + width: 969px; + text-align: left; } #page { padding: 2.15em 0 0 0; } #content { - margin: 0 230px 0 0; + margin: 0 230px 0 0; background: url(images/page-background.gif) repeat-x top left; } @@ -135,13 +136,13 @@ } /* Footer ****************************************************** */ -#footer { - clear: both; +#footer { + float:left; background: url(images/page-background.gif) repeat-x top left; margin: 10px 230px 0 auto; - width: auto; + width: 739px; text-align: center; - font-size: 0.8em; + font-size: 0.8em; } #footer ul { margin: 0; @@ -169,12 +170,13 @@ #primarynav { clear:right; float:right; - margin-top:14px; + margin-top:14px; + font-size: 0.9em; } #primarynav ul { margin: 0px; - padding:0px; + padding:0px; } #primarynav ul li { @@ -191,8 +193,7 @@ #primarynav ul a { display: inline; float: left; - text-decoration: none; - font-size:12px; + text-decoration: none; font-weight:bold; color: white; padding: 5px 20px 3px 20px; @@ -210,8 +211,7 @@ background-position: top left; } -#primarynav #current { - font-size: 12px; +#primarynav #current { font-weight: bold; } @@ -330,9 +330,7 @@ /* 6) Ssdebar ******************************************************************* */ #sidebar { - position: absolute; - top: 143px; - right: 30px; + float:right; background: #fff; width: 210px; line-height: 120%; Modified: projects/wiki/skins/devmo/css/wiki.css =================================================================== --- projects/wiki/skins/devmo/css/wiki.css 2007-06-28 18:43:40 UTC (rev 3758) +++ projects/wiki/skins/devmo/css/wiki.css 2007-06-28 20:22:16 UTC (rev 3759) @@ -7,7 +7,6 @@ } #since { - clear:both; margin-bottom: 8px; float:right; padding: 5px 5px 5px 5px; @@ -15,6 +14,7 @@ border:1px solid #333; color:white; font-weight:BOLD; + position:relative; } /* Special Slidebar Stuff */ @@ -499,7 +499,7 @@ } div.note { - clear:both; + border: solid goldenrod 2px; padding: 0px 10px 0px 10px; margin: 10px 0px 10px 0px; @@ -684,7 +684,6 @@ font-size: 1.4em; } .topicpage-table { - clear: both; width: 100%; margin: -30px 0 0 0; }