diff --git a/skins/UabVector.php b/skins/UabVector.php index 05b14a305ec8e872c2cc77658203ca6705b50b57..a8df81a8a00060c53acff15f785e000c3c099e36 100644 --- a/skins/UabVector.php +++ b/skins/UabVector.php @@ -509,6 +509,19 @@ class UabVectorTemplate extends QuickTemplate { <div id="whitebox-shadow"> <!-- whitebox --> <div id="whitebox"> + <!-- leftcolumn --> + <div id="leftcolumn"> + <!-- sidebar --> + <div class="sidebar"> + <!-- panel --> + <div id="mw-panel" class="noprint"> + <?php $this->renderPortals( $this->data['sidebar'] ); ?> + </div> + <!-- /panel --> + </div> + <!-- /sidebar --> + </div> + <!-- /leftcolumn --> <!-- maincolumn-l-r --> <div id="maincolumn-l-r"> <!-- content --> @@ -580,19 +593,6 @@ class UabVectorTemplate extends QuickTemplate { </div> </div> <!-- /header --> - <!-- leftcolumn --> - <div id="leftcolumn"> - <!-- sidebar --> - <div class="sidebar"> - <!-- panel --> - <div id="mw-panel" class="noprint"> - <?php $this->renderPortals( $this->data['sidebar'] ); ?> - </div> - <!-- /panel --> - </div> - <!-- /sidebar --> - </div> - <!-- /leftcolumn --> </div> <!-- /whitebox --> </div> @@ -716,7 +716,9 @@ class UabVectorTemplate extends QuickTemplate { default: ?> <div class="portal" id='<?php echo Sanitizer::escapeId( "p-$name" ) ?>'<?php echo $this->skin->tooltip( 'p-' . $name ) ?>> - <h5<?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?></h5> + <!-- moduletable --> + <div class="moduletable"> + <ul class ="menu" <?php $this->html('userlangattributes') ?>><?php $out = wfMsg( $name ); if ( wfEmptyMsg( $name, $out ) ) echo htmlspecialchars( $name ); else echo htmlspecialchars( $out ); ?> <div class="body"> <?php if ( is_array( $content ) ): ?> <ul> @@ -728,6 +730,9 @@ class UabVectorTemplate extends QuickTemplate { <?php echo $content; /* Allow raw HTML block to be defined by extensions */ ?> <?php endif; ?> </div> + </ul> + </div> + <!-- /moduletable --> </div> <?php break; diff --git a/skins/uabvector/main-ltr.css b/skins/uabvector/main-ltr.css index 86a5f236ae9d838ad6877d79d5c7ad93caecc623..4740d60ece2b23ec71d3c8b2e8139a1220bfd728 100644 --- a/skins/uabvector/main-ltr.css +++ b/skins/uabvector/main-ltr.css @@ -29,10 +29,10 @@ body { } /* Content */ #content { - margin-left: 10em; padding: 1em; - left: 30%; /* + margin-left: 10em; + left: 30%; background-image: url(images/border.png); background-position: top left; background-repeat: repeat-y; @@ -390,14 +390,8 @@ body { } /* Panel */ #mw-panel { - position: absolute; - top: 160px; - padding-top: 1em; - width: 10em; - left: 0; } #mw-panel div.portal { - padding-bottom: 1.5em; } #mw-panel div.portal h5 { font-weight: normal; @@ -407,13 +401,11 @@ body { padding-left: 1.75em; cursor: default; border: none; - font-size: 0.75em; } #mw-panel div.portal div.body { margin: 0; padding-top: 0.5em; margin-left: 1.25em; - background-image: url(images/portal-break.png); background-repeat: no-repeat; background-position: top left; } @@ -430,7 +422,6 @@ body { padding-bottom: 0.5em; margin: 0; overflow: hidden; - font-size: 0.75em; } #mw-panel div.portal div.body ul li a { color: #0645ad;