From db6458789a1489f1218444ae8a502a293f5336a0 Mon Sep 17 00:00:00 2001 From: MatmaRex Date: Wed, 26 Sep 2012 20:41:35 +0200 Subject: [PATCH] CologneBlue rewrite: get rid of some extra ugly HTML Change-Id: I90fd27951f4aceb215029c379c19e27f33179635 --- skins/CologneBlue.php | 61 ++++++++-------- skins/cologneblue/screen.css | 132 ++++++++++++++++++----------------- 2 files changed, 98 insertions(+), 95 deletions(-) diff --git a/skins/CologneBlue.php b/skins/CologneBlue.php index f225c4d33d..4e7459acd6 100644 --- a/skins/CologneBlue.php +++ b/skins/CologneBlue.php @@ -591,32 +591,33 @@ class CologneBlueTemplate extends BaseTemplate { function beforeContent() { $mainPageObj = Title::newMainPage(); - $s = "\n
\n
" . - ''; - - $s .= '
'; - $s .= ''; - $s .= '' . wfMessage( 'sitetitle' )->escaped() . ''; - - $s .= '
'; - - $s .= ''; - $s .= wfMessage( 'sitesubtitle' )->escaped() . ''; - $s .= ''; - - $s .= ''; - $s .= str_replace( '
', '', $this->otherLanguages() ); - - $s .= $this->getSkin()->getCategories(); - - $s .= '
' . $this->pageTitleLinks(); - $s .= ''; - - $s .= "
\n"; - - $s .= "\n
\n
"; + $s = "\n
\n"; + ob_start(); +?> +
+

+ + escaped() ?> + +

+

+ escaped() ?> +

+ + +
+ + getSkin()->getCategories() ?> + +
+
+"; $notice = $this->getSkin()->getSiteNotice(); if( $notice ) { @@ -631,12 +632,9 @@ class CologneBlueTemplate extends BaseTemplate { * @return string */ function afterContent(){ - $s = "\n

\n"; + $s = "\n
\n"; $s .= "\n\n
\n"; + $s .= "\n\n\n"; $s .= $this->quickBar(); return $s; diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css index 97d2119ea7..4716c38b87 100644 --- a/skins/cologneblue/screen.css +++ b/skins/cologneblue/screen.css @@ -20,10 +20,6 @@ body { font-size: 8pt; } -#topbar { - padding: 0; -} - #powersearch { background: #DDEEFF; border-style: solid; @@ -61,78 +57,25 @@ textarea { } #footer { + margin-right: 2%; + margin-top: 1em; padding: 4px; + font-family: verdana, arial, sans-serif; + font-size: 10pt; + text-align: center; } #footer form { display: inline; } -#sitetitle { - font-family: Times, serif; - color: white; - font-weight: normal; - font-size: 32pt; - line-height: 32pt; -} - -td.top { - background-color: #6688AA; - color: white; - margin-top: 4px; - margin-bottom: 4px; - padding-top: 0; - padding-bottom: 0; - text-transform: uppercase; - font-family: Verdana, Arial, sans-serif; - font-size: 8pt; -} - -td.top a { - font-family: Verdana, Arial, sans-serif; - background-color: #6688AA; - color: white; - text-decoration: none; - font-size: 10pt; -} - -td#top-syslinks { - text-align: right; - vertical-align: bottom; -} -td.top-linkcollection { - text-align: right; -} -/** - * Overrides text justification (user preference) - * See bug 31990 - */ -td.top-linkcollection #catlinks { - text-align: right; -} -td.top-subheader { - vertical-align: top; -} -td.bottom { - font-family: Verdana, Arial, sans-serif; - font-size: 10pt; - padding: 0; - text-align: center; - vertical-align: bottom; -} - #pagestats { font-family: Verdana, Arial, sans-serif; color: black; font-size: 9pt; } -#sitesub { - font-family: Verdana, Arial, sans-serif; - font-size: 9pt; font-weight: bold; - color: black; - padding-top: 0; -} + #quickbar { font-family: Verdana, Arial, sans-serif; @@ -232,3 +175,66 @@ input.mw-searchInput { #quickbar { position: absolute; left: 4px; } #article { margin-left: 148px; margin-right: 4px; } #footer { margin-left: 152px; } + + +#sitetitle, #sitesub, #syslinks, #linkcollection { + margin-top: 0; + margin-bottom: 0; +} + +#sitetitle, #syslinks { + color: white; + text-transform: uppercase; + height: 32pt; +} +#sitetitle { + padding-left: 8px; + font-family: Times, serif; + font-weight: normal; + font-size: 32pt; + line-height: 32pt; + background-color: #6688AA; +} +#sitetitle a, #syslinks a { + color: white; + text-decoration: none; +} + +#syslinks { + font-family: Verdana, Arial, sans-serif; + position: absolute; + top: 0; + right: 8px; + width: 100%; + font-size: 8pt; +} +#syslinks a { + font-size: 10pt; +} +#syslinks span { + position: absolute; + right: 0; + bottom: 0; + width: 100%; + text-align: right; +} + +#sitesub { + float: left; + margin-left: 8px; + font-family: Verdana, Arial, sans-serif; + font-size: 9pt; + font-weight: bold; + color: black; +} + +#linkcollection { + margin-top: 0.5em; + font-size: small; + margin-right: 8px; + text-align: right; +} +/* Override text justification (user preference), see bug 31990 */ +#linkcollection * { + text-align: right; +} -- 2.20.1