From: Chad Horohoe Date: Thu, 28 Mar 2013 13:43:02 +0000 (-0400) Subject: Remove several ancient skins X-Git-Tag: 1.31.0-rc.0~20141^2 X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=8dfd474b53a42f701272a85214f6f6d4183f5b75;p=lhc%2Fweb%2Fwiklou.git Remove several ancient skins Standard, Simple, Chick and MySkin have all been removed. Nostalgia has been moved to an extension for posterity. Change-Id: Ia6d73c2deb9428d214b7d69b29235094de75c52e --- diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index beecf18414..9b562ae5e6 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -25,6 +25,8 @@ changes to languages because of Bugzilla reports. === Other changes in 1.22 === * redirect.php was removed. It was unused. +* BREAKING CHANGE: Legacy skins Simple, MySkin and Standard were all removed. + Nostalgia was moved to an extension. == Compatibility == diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php index 9ef3165258..a10ca8c3a9 100644 --- a/includes/AutoLoader.php +++ b/includes/AutoLoader.php @@ -156,7 +156,6 @@ $wgAutoloadLocalClasses = array( 'LCStore_CDB' => 'includes/cache/LocalisationCache.php', 'LCStore_DB' => 'includes/cache/LocalisationCache.php', 'LCStore_Null' => 'includes/cache/LocalisationCache.php', - 'LegacyTemplate' => 'includes/SkinLegacy.php', 'License' => 'includes/Licenses.php', 'Licenses' => 'includes/Licenses.php', 'Linker' => 'includes/Linker.php', @@ -229,7 +228,6 @@ $wgAutoloadLocalClasses = array( 'SiteStatsInit' => 'includes/SiteStats.php', 'SiteStatsUpdate' => 'includes/SiteStats.php', 'Skin' => 'includes/Skin.php', - 'SkinLegacy' => 'includes/SkinLegacy.php', 'SkinTemplate' => 'includes/SkinTemplate.php', 'SpecialCreateAccount' => 'includes/SpecialPage.php', 'SpecialListAdmins' => 'includes/SpecialPage.php', @@ -1089,17 +1087,10 @@ $wgAutoloadLocalClasses = array( 'CologneBlueTemplate' => 'skins/CologneBlue.php', 'ModernTemplate' => 'skins/Modern.php', 'MonoBookTemplate' => 'skins/MonoBook.php', - 'NostalgiaTemplate' => 'skins/Nostalgia.php', - 'SkinChick' => 'skins/Chick.php', 'SkinCologneBlue' => 'skins/CologneBlue.php', 'SkinModern' => 'skins/Modern.php', 'SkinMonoBook' => 'skins/MonoBook.php', - 'SkinMySkin' => 'skins/MySkin.php', - 'SkinNostalgia' => 'skins/Nostalgia.php', - 'SkinSimple' => 'skins/Simple.php', - 'SkinStandard' => 'skins/Standard.php', 'SkinVector' => 'skins/Vector.php', - 'StandardTemplate' => 'skins/Standard.php', 'VectorTemplate' => 'skins/Vector.php', ); diff --git a/includes/Skin.php b/includes/Skin.php index a4cb9f4d9d..117e6e262d 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -131,7 +131,6 @@ abstract class Skin extends ContextSource { // in the user preferences. $fallback = array( 0 => $wgDefaultSkin, - 1 => 'nostalgia', 2 => 'cologneblue' ); diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index cf45dcbc03..c9ebc7e0b9 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -335,7 +335,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { \$wgUpgradeKey = \"{$this->values['wgUpgradeKey']}\"; ## Default skin: you can change the default skin. Use the internal symbolic -## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector': +## names, ie 'cologneblue', 'monobook', 'vector': \$wgDefaultSkin = \"{$this->values['wgDefaultSkin']}\"; ## For attaching licensing metadata to pages, and displaying an diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php index d95f1959b2..44b6cc9477 100644 --- a/languages/messages/MessagesEn.php +++ b/languages/messages/MessagesEn.php @@ -3692,13 +3692,8 @@ You can view its source', # Stylesheets 'common.css' => '/* CSS placed here will be applied to all skins */', # only translate this message to other languages if you have to change it -'standard.css' => '/* CSS placed here will affect users of the Standard skin */', # only translate this message to other languages if you have to change it -'nostalgia.css' => '/* CSS placed here will affect users of the Nostalgia skin */', # only translate this message to other languages if you have to change it 'cologneblue.css' => '/* CSS placed here will affect users of the Cologne Blue skin */', # only translate this message to other languages if you have to change it 'monobook.css' => '/* CSS placed here will affect users of the MonoBook skin */', # only translate this message to other languages if you have to change it -'myskin.css' => '/* CSS placed here will affect users of the MySkin skin */', # only translate this message to other languages if you have to change it -'chick.css' => '/* CSS placed here will affect users of the Chick skin */', # only translate this message to other languages if you have to change it -'simple.css' => '/* CSS placed here will affect users of the Simple skin */', # only translate this message to other languages if you have to change it 'modern.css' => '/* CSS placed here will affect users of the Modern skin */', # only translate this message to other languages if you have to change it 'vector.css' => '/* CSS placed here will affect users of the Vector skin */', # only translate this message to other languages if you have to change it 'print.css' => '/* CSS placed here will affect the print output */', # only translate this message to other languages if you have to change it @@ -3711,13 +3706,8 @@ You can view its source', # Scripts 'common.js' => '/* Any JavaScript here will be loaded for all users on every page load. */', # only translate this message to other languages if you have to change it -'standard.js' => '/* Any JavaScript here will be loaded for users using the Standard skin */', # only translate this message to other languages if you have to change it -'nostalgia.js' => '/* Any JavaScript here will be loaded for users using the Nostalgia skin */', # only translate this message to other languages if you have to change it 'cologneblue.js' => '/* Any JavaScript here will be loaded for users using the Cologne Blue skin */', # only translate this message to other languages if you have to change it 'monobook.js' => '/* Any JavaScript here will be loaded for users using the MonoBook skin */', # only translate this message to other languages if you have to change it -'myskin.js' => '/* Any JavaScript here will be loaded for users using the MySkin skin */', # only translate this message to other languages if you have to change it -'chick.js' => '/* Any JavaScript here will be loaded for users using the Chick skin */', # only translate this message to other languages if you have to change it -'simple.js' => '/* Any JavaScript here will be loaded for users using the Simple skin */', # only translate this message to other languages if you have to change it 'modern.js' => '/* Any JavaScript here will be loaded for users using the Modern skin */', # only translate this message to other languages if you have to change it 'vector.js' => '/* Any JavaScript here will be loaded for users using the Vector skin */', # only translate this message to other languages if you have to change it 'group-autoconfirmed.js' => '/* Any JavaScript here will be loaded for autoconfirmed users only */', # only translate this message to other languages if you have to change it @@ -3800,13 +3790,8 @@ This is probably caused by a link to a blacklisted external site.', 'pageinfo-category-files' => 'Number of files', # Skin names -'skinname-standard' => 'Classic', # only translate this message to other languages if you have to change it -'skinname-nostalgia' => 'Nostalgia', # only translate this message to other languages if you have to change it 'skinname-cologneblue' => 'Cologne Blue', # only translate this message to other languages if you have to change it 'skinname-monobook' => 'MonoBook', # only translate this message to other languages if you have to change it -'skinname-myskin' => 'MySkin', # only translate this message to other languages if you have to change it -'skinname-chick' => 'Chick', # only translate this message to other languages if you have to change it -'skinname-simple' => 'Simple', # only translate this message to other languages if you have to change it 'skinname-modern' => 'Modern', # only translate this message to other languages if you have to change it 'skinname-vector' => 'Vector', # only translate this message to other languages if you have to change it diff --git a/resources/Resources.php b/resources/Resources.php index 4374b09c07..0db3e200bf 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -60,12 +60,6 @@ return array( * * See Vector for an example. */ - - 'skins.chick' => array( - 'styles' => array( 'chick/main.css' => array( 'media' => 'screen, handheld' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), 'skins.cologneblue' => array( 'styles' => array( 'cologneblue/screen.css' => array( 'media' => 'screen' ) ), 'remoteBasePath' => $GLOBALS['wgStylePath'], @@ -89,21 +83,6 @@ return array( 'remoteBasePath' => $GLOBALS['wgStylePath'], 'localBasePath' => $GLOBALS['wgStyleDirectory'], ), - 'skins.nostalgia' => array( - 'styles' => array( 'nostalgia/screen.css' => array( 'media' => 'screen' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), - 'skins.simple' => array( - 'styles' => array( 'simple/main.css' => array( 'media' => 'screen' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), - 'skins.standard' => array( - 'styles' => array( 'standard/main.css' => array( 'media' => 'screen' ) ), - 'remoteBasePath' => $GLOBALS['wgStylePath'], - 'localBasePath' => $GLOBALS['wgStyleDirectory'], - ), 'skins.vector' => array( // Keep in sync with WebInstallerOutput::getCSS() 'styles' => array( diff --git a/skins/Chick.php b/skins/Chick.php deleted file mode 100644 index 75b807ad99..0000000000 --- a/skins/Chick.php +++ /dev/null @@ -1,47 +0,0 @@ -addModuleStyles( 'skins.chick' ); - - // TODO: Migrate all of these to RL - $out->addStyle( 'chick/IE60Fixes.css', 'screen,handheld', 'IE 6' ); - } -} diff --git a/skins/MySkin.php b/skins/MySkin.php deleted file mode 100644 index fb49b88d19..0000000000 --- a/skins/MySkin.php +++ /dev/null @@ -1,35 +0,0 @@ -addModuleStyles( 'skins.nostalgia' ); - } - -} - -class NostalgiaTemplate extends LegacyTemplate { - - /** - * @return string - */ - function doBeforeContent() { - $s = "\n
\n
\n"; - $s .= ''; - - $s .= $this->pageTitle(); - $s .= $this->pageSubtitle() . "\n"; - - $s .= '
'; - $s .= $this->topLinks() . "\n
"; - - $notice = $this->getSkin()->getSiteNotice(); - if( $notice ) { - $s .= "\n
$notice
\n"; - } - $s .= $this->pageTitleLinks(); - - $ol = $this->otherLanguages(); - if( $ol ) { - $s .= '
' . $ol; - } - - $s .= $this->getSkin()->getCategories(); - - $s .= "
\n
\n"; - $s .= "\n
"; - - return $s; - } - - /** - * @return string - */ - function topLinks() { - $sep = " |\n"; - - $s = $this->getSkin()->mainPageLink() . $sep - . Linker::specialLink( 'Recentchanges' ); - - if ( $this->data['isarticle'] ) { - $s .= $sep . '' . $this->editThisPage() . '' . $sep . $this->talkLink() . - $sep . $this->historyLink(); - } - - /* show links to different language variants */ - $s .= $this->variantLinks(); - $s .= $this->extensionTabLinks(); - if ( !$this->data['loggedin'] ) { - $s .= $sep . Linker::specialLink( 'Userlogin' ); - } else { - /* show user page and user talk links */ - $user = $this->getSkin()->getUser(); - $s .= $sep . Linker::link( $user->getUserPage(), wfMessage( 'mypage' )->escaped() ); - $s .= $sep . Linker::link( $user->getTalkPage(), wfMessage( 'mytalk' )->escaped() ); - if ( $user->getNewtalk() ) { - $s .= ' *'; - } - /* show watchlist link */ - $s .= $sep . Linker::specialLink( 'Watchlist' ); - /* show my contributions link */ - $s .= $sep . Linker::link( - SpecialPage::getSafeTitleFor( 'Contributions', $this->data['username'] ), - wfMessage( 'mycontris' )->escaped() ); - /* show my preferences link */ - $s .= $sep . Linker::specialLink( 'Preferences' ); - /* show upload file link */ - if( UploadBase::isEnabled() && UploadBase::isAllowed( $user ) === true ) { - $s .= $sep . $this->getUploadLink(); - } - - /* show log out link */ - $s .= $sep . Linker::specialLink( 'Userlogout' ); - } - - $s .= $sep . $this->specialPagesList(); - - return $s; - } - - /** - * @return string - */ - function doAfterContent() { - $s = "\n

\n"; - - $s .= "\n\n
\n"; - - return $s; - } -} diff --git a/skins/Simple.php b/skins/Simple.php deleted file mode 100644 index 9a3ab9468c..0000000000 --- a/skins/Simple.php +++ /dev/null @@ -1,58 +0,0 @@ -addModuleStyles( 'skins.simple' ); - - /* Add some userprefs specific CSS styling */ - $rules = array(); - $underline = ""; - - if ( $this->getUser()->getOption( 'underline' ) < 2 ) { - $underline = "text-decoration: " . $this->getUser()->getOption( 'underline' ) ? 'underline !important' : 'none' . ";"; - } - $style = implode( "\n", $rules ); - $out->addInlineStyle( $style, 'flip' ); - - } -} diff --git a/skins/Standard.php b/skins/Standard.php deleted file mode 100644 index 5b358e0668..0000000000 --- a/skins/Standard.php +++ /dev/null @@ -1,294 +0,0 @@ -addModuleStyles( 'skins.standard' ); - - $qb = $this->qbSetting(); - $rules = array(); - - if ( 2 == $qb ) { # Right - $rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; right: 4px; border-left: 2px solid #000000; }"; - $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 4px; margin-right: 152px; }"; - $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }"; - } elseif ( 1 == $qb || 3 == $qb ) { - $rules[] = "/* @noflip */#quickbar { position: absolute; top: 4px; left: 4px; border-right: 1px solid gray; }"; - $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-left: 152px; margin-right: 4px; }"; - $rules[] = "/* @noflip */#topbar, #footer { margin-left: 152px; }"; - if( 3 == $qb ) { - $rules[] = "/* @noflip */#quickbar { position: fixed; padding: 4px; }"; - } - } elseif ( 4 == $qb ) { - $rules[] = "/* @noflip */#quickbar { position: fixed; right: 0; top: 0; padding: 4px; }"; - $rules[] = "/* @noflip */#quickbar { border-right: 1px solid gray; }"; - $rules[] = "/* @noflip */#article, #mw-data-after-content { margin-right: 152px; margin-left: 4px; }"; - $rules[] = "/* @noflip */#topbar, #footer { margin-right: 152px; }"; - } - $style = implode( "\n", $rules ); - $out->addInlineStyle( $style, 'flip' ); - } - -} - -class StandardTemplate extends LegacyTemplate { - - /** - * @return string - */ - function doAfterContent() { - wfProfileIn( __METHOD__ ); - wfProfileIn( __METHOD__ . '-1' ); - - $s = "\n
\n"; - $s .= "\n\n\n"; - - wfProfileOut( __METHOD__ . '-2' ); - wfProfileIn( __METHOD__ . '-3' ); - if ( $this->getSkin()->qbSetting() != 0 ) { - $s .= $this->quickBar(); - } - wfProfileOut( __METHOD__ . '-3' ); - wfProfileOut( __METHOD__ ); - return $s; - } - - /** - * @return string - */ - function quickBar() { - global $wgContLang; - - wfProfileIn( __METHOD__ ); - - $action = $this->getSkin()->getRequest()->getText( 'action' ); - $wpPreview = $this->getSkin()->getRequest()->getBool( 'wpPreview' ); - $title = $this->getSkin()->getTitle(); - $tns = $title->getNamespace(); - - $s = "\n
"; - $s .= "\n" . $this->getSkin()->logoText() . "\n
"; - - $sep = "\n
"; - - # Use the first heading from the Monobook sidebar as the "browse" section - $bar = $this->getSkin()->buildSidebar(); - unset( $bar['SEARCH'] ); - unset( $bar['LANGUAGES'] ); - unset( $bar['TOOLBOX'] ); - - $barnumber = 1; - foreach ( $bar as $browseLinks ) { - if ( is_array( $browseLinks ) ) { - if ( $barnumber > 1 ) { - $s .= "\n
"; - } - foreach ( $browseLinks as $link ) { - if ( $link['text'] != '-' ) { - $s .= "" . - htmlspecialchars( $link['text'] ) . '' . $sep; - } - } - } - if ( $barnumber == 1 ) { - // only show watchlist link if logged in - if( $this->data['loggedin'] ) { - $s.= Linker::specialLink( 'Watchlist' ) ; - $s .= $sep . Linker::linkKnown( - SpecialPage::getTitleFor( 'Contributions' ), - wfMessage( 'mycontris' )->escaped(), - array(), - array( 'target' => $this->data['username'] ) - ); - } - } - $barnumber = $barnumber + 1; - } - - $s .= "\n
"; - $articleExists = $title->getArticleID(); - if ( $this->data['isarticle'] || $action == 'edit' || $action == 'history' || $wpPreview ) { - if( $this->data['isarticle'] ) { - $s .= '' . $this->editThisPage() . ''; - } else { # backlink to the article in edit or history mode - if( $articleExists ){ # no backlink if no article - switch( $tns ) { - case NS_TALK: - case NS_USER_TALK: - case NS_PROJECT_TALK: - case NS_FILE_TALK: - case NS_MEDIAWIKI_TALK: - case NS_TEMPLATE_TALK: - case NS_HELP_TALK: - case NS_CATEGORY_TALK: - $text = wfMessage('viewtalkpage'); - break; - case NS_MAIN: - $text = wfMessage( 'articlepage' ); - break; - case NS_USER: - $text = wfMessage( 'userpage' ); - break; - case NS_PROJECT: - $text = wfMessage( 'projectpage' ); - break; - case NS_FILE: - $text = wfMessage( 'imagepage' ); - break; - case NS_MEDIAWIKI: - $text = wfMessage( 'mediawikipage' ); - break; - case NS_TEMPLATE: - $text = wfMessage( 'templatepage' ); - break; - case NS_HELP: - $text = wfMessage( 'viewhelppage' ); - break; - case NS_CATEGORY: - $text = wfMessage( 'categorypage' ); - break; - default: - $text = wfMessage( 'articlepage' ); - } - - $link = $title->getText(); - $nstext = $wgContLang->getNsText( $tns ); - if( $nstext ) { # add namespace if necessary - $link = $nstext . ':' . $link; - } - - $s .= Linker::link( Title::newFromText( $link ), $text->escaped() ); - } elseif( $title->getNamespace() != NS_SPECIAL ) { - # we just throw in a "New page" text to tell the user that he's in edit mode, - # and to avoid messing with the separator that is prepended to the next item - $s .= '' . wfMessage( 'newpage' )->escaped() . ''; - } - } - - # "Post a comment" link - if( ( $title->isTalkPage() || $this->getSkin()->getOutput()->showNewSectionLink() ) && $action != 'edit' && !$wpPreview ) - $s .= '
' . Linker::link( - $title, - wfMessage( 'postcomment' )->escaped(), - array(), - array( - 'action' => 'edit', - 'section' => 'new' - ) - ); - - /** - * Watching could cause problems in edit mode: - * if user edits article, then loads "watch this article" in background and then saves - * article with "Watch this article" checkbox disabled, the article is transparently - * unwatched. Therefore we do not show the "Watch this page" link in edit mode. - */ - if ( $this->data['loggedin'] && $articleExists ) { - if( $action != 'edit' && $action != 'submit' ) { - $s .= $sep . $this->watchThisPage(); - } - if ( $title->userCan( 'edit' ) ) - $s .= $sep . $this->moveThisPage(); - } - if ( $this->getSkin()->getUser()->isAllowed( 'delete' ) && $articleExists ) { - $s .= $sep . $this->deleteThisPage() . - $sep . $this->protectThisPage(); - } - $s .= $sep . $this->talkLink(); - if( $articleExists && $action != 'history' ) { - $s .= $sep . $this->historyLink(); - } - $s .= $sep . $this->whatLinksHere(); - - if( $this->getSkin()->getOutput()->isArticleRelated() ) { - $s .= $sep . $this->watchPageLinksLink(); - } - - if ( - NS_USER == $title->getNamespace() || - $title->getNamespace() == NS_USER_TALK - ) { - - $id = User::idFromName( $title->getText() ); - $ip = User::isIP( $title->getText() ); - - if( $id || $ip ){ - $s .= $sep . $this->userContribsLink(); - } - if( $this->getSkin()->showEmailUser( $id ) ) { - $s .= $sep . $this->emailUserLink(); - } - } - $s .= "\n
"; - } - - if( UploadBase::isEnabled() && UploadBase::isAllowed( $this->getSkin()->getUser() ) === true ) { - $s .= $this->getUploadLink() . $sep; - } - - $s .= Linker::specialLink( 'Specialpages' ); - - global $wgSiteSupportPage; - if( $wgSiteSupportPage ) { - $s .= "\n
' . wfMessage( 'sitesupport' )->escaped() . ''; - } - - $s .= "\n
\n"; - wfProfileOut( __METHOD__ ); - return $s; - } -} diff --git a/skins/chick/IE60Fixes.css b/skins/chick/IE60Fixes.css deleted file mode 100644 index 18e9655d93..0000000000 --- a/skins/chick/IE60Fixes.css +++ /dev/null @@ -1,79 +0,0 @@ -/* 6.0 - only fixes */ -/* content area */ -/* workaround for various ie float bugs */ -#column-content { - float: none; - margin-left: 0; - height: 1%; -} -#column-content #content { - margin-left: 12.2em; - margin-top: 3em; - height: 1%; -} -#column-one { - position: absolute; - top: 0; - left: 0; - z-index: 4; -} -#footer { - margin-left: 13.6em; - border-left: 1px solid #fabd23; -} - -/* the tabs */ - -#p-cactions { - z-index: 3; -} - -#p-cactions li { - padding-bottom: 0 !important; - border: none; - background-color: transparent; - cursor: default; - float: none !important; -} -#p-cactions li a { - display: inline-block !important; - vertical-align: top; - padding-bottom: 0; - border: solid #aaa; - border-width: 1px 1px 0; -} -#p-cactions li.selected a { - border-color: #fabd23; - padding-bottom: 0.17em; -} -#p-cactions li a:hover { - padding-bottom: 0.17em; -} -#portal-personaltools { - padding-bottom: 0.1em; -} -#bodyContent a.external { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} - -/* show the hand */ -#p-logo a, -#p-logo a:hover { - cursor: pointer; -} -div.visualClear { - width:100%; - line-height: 0; -} -textarea { - width: 96%; -} - -div.editsection, -#catlinks, -div.tright, -div.tleft { - position: relative; -} -/*{ border:1px solid Red !important;}*/ diff --git a/skins/chick/main.css b/skins/chick/main.css deleted file mode 100644 index 5e2a2e7a97..0000000000 --- a/skins/chick/main.css +++ /dev/null @@ -1,368 +0,0 @@ -/* -** MediaWiki 'chick' style sheet for PDAs or other small-screen devices. -** Copyright Timwi -** License: GPL (http://www.gnu.org/copyleft/gpl.html) -** -** Loosely based on Monobook by Gabriel Wicke -*/ - -body { - font-family: sans-serif; - color: black; - background: white; - margin: 0; - padding: 0.3em; -} - -a { color: #002bb8; } -a:visited { color: #5a3696; } -a:active { color: #ffa500; } -a.stub { color: #772233; } -a.new, -#p-personal a.new { color:#ba0000; } -a.new:visited, -#p-personal a.new:visited { color:#a55858; } - -img { - border: none; - vertical-align: middle; -} -p { - margin: 0.4em 0em 0.5em 0em; - line-height: 1.5em; -} - -p img { margin: 0; } - -hr { - height: 1px; - color: #aaaaaa; - background-color: #aaaaaa; - border: 0; - margin: 0.2em 0 0.2em 0; -} - -h1, h2, h3, h4, h5, h6 { - color: black; - background: none; - font-weight: normal; - margin: 0; - overflow: hidden; - padding-top: 0.5em; - padding-bottom: 0.17em; - border-bottom: 1px solid #aaaaaa; -} -.editsection { - font-weight: normal; -} -h1 { font-size: 188%; } -h1 .editsection { font-size: 53.2%; } -h2 { font-size: 150%; } -h2 .editsection { font-size: 66.7%; } -h3, h4, h5, h6 { - border-bottom: none; - font-weight: bold; -} -h3 { font-size: 132%; } -h3 .editsection { font-size: 75.8%; } -h4 { font-size: 116%; } -h4 .editsection { font-size: 86.2%; } -h5 { font-size: 100%; } -h6 { font-size: 80%; } -h6 .editsection { font-size: 125%; } - -ul { - line-height: 1.5em; - margin: 0.3em 0 0 1.5em; - padding:0; -} -ol { - line-height: 1.5em; - margin: 0.3em 0 0 3.2em; - padding:0; - list-style-image: none; -} -li { margin-bottom: 0.1em; } -dt { - font-weight: bold; - margin-bottom: 0.1em; -} -dl{ - margin-top: 0.2em; - margin-bottom: 0.5em; -} -dd { - line-height: 1.5em; - margin-left: 2em; - margin-bottom: 0.1em; -} - -fieldset { - border: 1px solid #2f6fab; - margin: 1em 0em 1em 0em; - padding: 0em 1em 1em 1em; - line-height: 1.5em; -} -legend { - background: white; - padding: 0.5em; - font-size: 95%; -} -form { - border: none; - margin: 0; -} - -textarea { - border: 1px solid #2f6fab; - color: black; - background-color: white; - width: 100%; - padding: 0.1em; - overflow: auto; -} -/* hide this from ie/mac and konq2.2 */ -@media All { - head:first-child+body input { - visibility: visible; - border: 1px solid #2f6fab; - color: black; - background-color: white; - vertical-align: middle; - padding: 0.2em; - } -} -input.historysubmit { - padding: 0 0.3em 0.3em 0.3em !important; - font-size: 94%; - cursor: pointer; - height: 1.7em !important; - margin-left: 1.6em; -} -input[type="radio"], -input[type="checkbox"] { border:none; } -select { - border: 1px solid #2f6fab; - color: black; - vertical-align: top; -} -q { - font-family: Times, "Times New Roman", serif; - font-style: italic; -} -code { background-color: #f9f9f9; } -pre, .mw-code { - padding: 1em; - border: 1px dashed #2f6fab; - color: black; - background-color: #f9f9f9; - line-height: 1.1em; -} - -/* -** the main content area -*/ - -span.subpages { display: block; } - -/* Some space under the headers in the content area */ -#bodyContent h1, #bodyContent h2 { margin-bottom:0.6em; } -#bodyContent h3, -#bodyContent h4, -#bodyContent h5 { - margin-bottom: 0.3em; -} -#firstHeading { margin-bottom:0.1em; } - -/* user notification thing */ -.usermessage { - background-color: #ffce7b; - border: 1px solid #ffa500; - color: black; - font-weight: bold; - margin: 0.1em 0 0 0; - padding: 2px 5px; - vertical-align: middle; -} -#siteNotice { - text-align: center; - font-size: 95%; - padding: 0 0.9em 0 0.9em; -} -#siteNotice p { margin: 0; padding: 0; } -.error { - color: red; - font-size: larger; -} -.catlinks { - border:1px solid #aaaaaa; - background-color:#f9f9f9; - padding: 2px 5px; - margin: 0.1em 0 0 0; - clear: both; -} -.catlinks { margin: 0; padding: 0; } - -/* emulate center */ -.center { - width: 100%; - text-align: center; -} -*.center * { - margin-left: auto; - margin-right: auto; -} -/* small for tables and similar */ -.small { font-size: 94%; } -table.small { font-size: 100% } - -/* -** content styles -*/ - -#toc { - /*border:1px solid #2f6fab;*/ - border:1px solid #aaaaaa; - background-color:#f9f9f9; - padding:5px; - font-size: 95%; -} -#toc ul { margin: 0 2em; } -#toc .toctoggle { font-size: 94%; } -#toc .editsection { - margin-top: 0.7em; - font-size: 94%; -} - -/* images */ -/* @noflip */div.floatright, table.floatright { - margin: 0; - border: 0.5em solid white; - border-width: 0.5em 0 0.8em 1.4em; -} -div.floatright p { font-style: italic; } -/* @noflip */div.floatleft, table.floatleft { - margin: 0.3em 0.5em 0.5em 0; - border: 0.5em solid white; - border-width: 0.5em 1.4em 0.8em 0; -} -div.floatleft p { font-style: italic; } -/* thumbnails */ -div.thumb { - margin-bottom: 0.5em; - width: auto; -} -div.thumbinner { - border:1px solid #cccccc; - padding: 3px !important; - background-color:#f9f9f9; - font-size: 94%; - text-align: center; - overflow: hidden; -} -html .thumbimage { - border:1px solid #cccccc; -} -html .thumbcaption { - border: none; - text-align: left; - line-height: 1.4em; - padding: 0.3em 0 0.1em 0; -} -div.magnify { - float: right; - border: none !important; - background: none !important; -} -div.magnify a, div.magnify img { - display: block; - border: none !important; - background: none !important; -} -/* @noflip */div.tright { - margin: 0.5em 0 1.3em 1.4em; -} -/* @noflip */div.tleft { - margin: 0.5em 1.4em 1.3em 0; -} -img.thumbborder { - border: 1px solid #dddddd; -} - -/* -** classes for special content elements like town boxes -** intended to be referenced directly from the wiki src -*/ - -/* -** User styles -*/ -/* table standards */ -table.rimage { - float:right; - position:relative; - margin-left:1em; - margin-bottom:1em; - text-align:center; -} -.toccolours { - border:1px solid #aaaaaa; - background-color:#f9f9f9; - padding:5px; - font-size: 95%; -} - -/* -** edit views etc -*/ -.special li { - line-height: 1.4em; - margin: 0; - padding: 0; -} - -a.external { color: #3366bb; } -div#footer { text-align: center; } -ul#f-list li { list-style: none; text-align: center; } -div.portlet { margin: 0.5em 0; } - -.redirectText { - font-size:150%; - margin:5px; -} - -ul.special li.not-patrolled, ol.special li.not-patrolled { - background-color: #ffa; -} -div.patrollink { - font-size: 75%; - text-align: right; -} - -span.updatedmarker { - color:black; - background-color:#00FF00; -} - -div.gallerybox { - width: 150px; -} - -#xjump-to-nav { - display: none; -} - -.templatesUsed { margin-top: 1.5em; } - -#footer { - background-color: white; - border-top: 1px solid #fabd23; - border-bottom: 1px solid #fabd23; - margin: .6em 0 1em 0; - padding: .4em 0 1.2em 0; - text-align: center; - font-size: 90%; -} -#f-poweredbyico, #f-copyrightico { - display: inline; -} diff --git a/skins/myskin/main.css b/skins/myskin/main.css deleted file mode 100644 index f3ab020480..0000000000 --- a/skins/myskin/main.css +++ /dev/null @@ -1 +0,0 @@ -/* this file must be empty */ diff --git a/skins/nostalgia/screen.css b/skins/nostalgia/screen.css deleted file mode 100644 index aed5715b1f..0000000000 --- a/skins/nostalgia/screen.css +++ /dev/null @@ -1,56 +0,0 @@ -body { - /* background color is set separately on page type */ - color: black; -} - -#specialform { - display: inline; -} - -#powersearch { - background: #DDEEFF; - border-style: solid; - border-width: 1px; - padding: 2px; -} - -a.new { - color: #ba0000; -} - -a.interwiki, -a.external { - color: #3366BB; -} - -a.printable { - text-decoration: underline; -} - -a.stub { - color: #772233; - text-decoration: none; -} - -h1.pagetitle { - padding-top: 0; - margin-top: 0; - padding-bottom: 0; - margin-bottom: 0; -} - -h2, h3, h4, h5, h6 { - margin-bottom: 0; -} - -textarea { - overflow: auto; -} - -p.subtitle { - padding-top: 0; - margin-top: 0; -} -div.sitenotice { - clear: both; -} diff --git a/skins/simple/discussionitem_icon.gif b/skins/simple/discussionitem_icon.gif deleted file mode 100644 index e3ca6d9e0e..0000000000 Binary files a/skins/simple/discussionitem_icon.gif and /dev/null differ diff --git a/skins/simple/external.png b/skins/simple/external.png deleted file mode 100644 index acf260fcd9..0000000000 Binary files a/skins/simple/external.png and /dev/null differ diff --git a/skins/simple/file_icon.gif b/skins/simple/file_icon.gif deleted file mode 100644 index 69dbeaf77b..0000000000 Binary files a/skins/simple/file_icon.gif and /dev/null differ diff --git a/skins/simple/link_icon.gif b/skins/simple/link_icon.gif deleted file mode 100644 index 168c1a2fe9..0000000000 Binary files a/skins/simple/link_icon.gif and /dev/null differ diff --git a/skins/simple/lock_icon.gif b/skins/simple/lock_icon.gif deleted file mode 100644 index 8284403306..0000000000 Binary files a/skins/simple/lock_icon.gif and /dev/null differ diff --git a/skins/simple/mail_icon.gif b/skins/simple/mail_icon.gif deleted file mode 100644 index cf5680d9f4..0000000000 Binary files a/skins/simple/mail_icon.gif and /dev/null differ diff --git a/skins/simple/main.css b/skins/simple/main.css deleted file mode 100644 index edb1d7d48d..0000000000 --- a/skins/simple/main.css +++ /dev/null @@ -1,427 +0,0 @@ -/** - * For clarity, explicitly state some recommendations from - * http://www.w3.org/TR/CSS21/sample.html to make sure the editsection links scale right. - */ - -h1 { - font-size: 2em; -} -h2 { - font-size: 1.5em; -} -h3 { - font-size: 1.17em; -} -h5 { - font-size: .83em; -} -h6 { - font-size: .75em; -} -h1, h2, h3, h4, h5, h6 { - font-weight: bolder; -} - -/* Now the custom parts */ - -/* Make edit sections (which are inside h# tags) normal-sized */ -.editsection { - font-weight: normal; -} -h1 .editsection { - font-size: 50%; -} -h2 .editsection { - font-size: 66.7%; -} -h3 .editsection { - font-size: 85.5%; -} -h5 .editsection { - font-size: 120%; -} -h6 .editsection { - font-size: 133%; -} - -#toolbar { - display: none; -} - -div.center { - text-align: center; -} - -#contentSub { - padding-left: 2em; -} - -a { - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - -#column-content { - width: 100%; - float: right; - margin: 0 0 0.6em -12.2em; - padding: 0; -} - -#content { - margin: 0em 0 0 12.2em; - padding: 0em 1em 1.5em 1em; - border-left: 1px solid #959595; - line-height: 1.5em; -} - -#column-one { - position: absolute; - top: 0; - left: 0; -} - -/* Hide, but keep accessible for screen-readers */ -#column-one h2 { - position: absolute; - top: -9999px; -} - -body { - margin: 0; - padding: 0; -} - -#globalWrapper { - width: 100%; - height: 100%; - margin: 0; - padding: 0; -} -.visualClear { - clear: both; -} - -img { - border: none; -} -p { - margin: 0.4em 0em 0.5em 0em; - line-height: 1.5em; -} -p img { - margin: 0; -} - -h1, h2, h3, h4, h5, h6 { - margin: 0; - padding-top: 0.5em; - padding-bottom: 0.17em; -} -fieldset { - margin: 1em 0em 1em 0em; - padding: 0em 1em 1em 1em; -} -.usermessage { - background-color: #ffce7b; - border: 1px solid #ffa500; - color: black; - font-weight: bold; - margin: 2em 0em 1em 0em; - padding: 0.5em 1em; - vertical-align: middle; -} -.error { - color: red; - font-size: larger; -} - -table.rimage { - float: right; - position: relative; - margin-left: 1em; - margin-bottom: 1em; - text-align: center; -} - -.portlet { - border: none; - float: none; - padding: 0; - width: 11.8em; - overflow: hidden; -} -.portlet h4 { - font-weight: normal; - white-space: nowrap; -} -.portlet h5 { - padding: 0em 1em 0em 0.5em; - display: inline; - height: 1em; - font-weight: normal; - white-space: nowrap; -} -.portlet h6 { - padding: 0em 1em 0em 1em; - display: block; - height: 1.2em; - font-weight: normal; - white-space: nowrap; -} -.pBody { - border-collapse: collapse; - padding: 0 0.8em 0.3em 0.5em; -} -.portlet h1, -.portlet h2, -.portlet h3, -.portlet h4 { - margin: 0; - padding: 0; - font-size: small; -} - -#p-search .pBody { - text-align: center; -} - -#searchInput { - width: 100%; - clear: both; - margin: 0 0 0 0; -} - -input.searchButton { - margin-top: 1px; - padding: 0 0.4em; - cursor: pointer; -} - -#p-search .pBody { - padding: 0.5em 0.4em 0.4em 0.4em; -} - -/* feed links */ -a.feedlink { - background: url(../common/images/feed-icon.png) center left no-repeat; - padding-left: 16px; -} - -textarea { - width: 100%; -} - -.pBody li, -.pBody ul { - padding-left: 0em; - margin-left: 0.5em; -} - -pre, .mw-code { - margin: 2em; - border: solid 1px black; -} - -h1.firstHeading, -h2 { - border-bottom: solid 1px black; -} -#bodyContent a.external, -#bodyContent a.external[href ^="gopher://"] { - background: url(external.png) center right no-repeat; - padding-right: 13px; -} -#bodyContent a.external[href ^="https://"], -.link-https { - background: url(lock_icon.gif) center right no-repeat; - padding-right: 16px; -} -#bodyContent a.external[href ^="mailto:"], -.link-mailto { - background: url(mail_icon.gif) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href ^="news:"] { - background: url(news_icon.png) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href ^="ftp://"], -.link-ftp { - background: url(file_icon.gif) center right no-repeat; - padding-right: 18px; -} -#bodyContent a.external[href ^="irc://"], -#bodyContent a.external[href ^="ircs://"], -.link-irc { - background: url(discussionitem_icon.gif) center right no-repeat; - padding-right: 18px; -} - -#bodyContent a.extiw, -#bodyContent a.extiw:active { - color: #5E7CFF; -} - -td.diff-addedline { - background-color: #B9FFB0; -} - -td.diff-deletedline { - background-color: #f8ffaa; -} - -.diffchange { - background-color: #FFCDF3; - text-decoration: none; -} - -#pagehistory li { - border: none; -} - -div.tocindent { - margin-left: 2em; -} -#toc { - text-align: left; - border-top: solid 1px black; - border-bottom: solid 1px black; -} - -/* @noflip */div.floatright, table.floatright { - margin: 0; - border-width: 0.5em 0 0.8em 1.4em; -} -div.floatright p { - font-style: italic; -} -/* @noflip */div.floatleft, table.floatleft { - margin: 0.3em 0.5em 0.5em 0; - border-width: 0.5em 1.4em 0.8em 0; -} -div.floatleft p { - font-style: italic; -} - -/* thumbnails */ -div.thumb { - margin-bottom: 0.5em; - width: auto; -} -div.thumbinner { - padding: 3px !important; - text-align: center; - overflow: hidden; -} - -html .thumbcaption { - border: none; - text-align: left; - line-height: 1.4; - padding: 0.3em 0 0.1em 0; -} -div.magnify { - float: right; - border: none !important; - background: none !important; -} -div.magnify a, -div.magnify img { - display: block; - border: none !important; - background: none !important; -} -/* @noflip */div.tright { - border-width: 0.5em 0 0.8em 1.4em; -} -/* @noflip */div.tleft { - margin-right: 0.5em; - border-width: 0.5em 1.4em 0.8em 0; -} -img.thumbborder { - border: 1px solid #dddddd; -} - -a.stub { - color: #772233; -} -a.new, -#p-personal a.new { - color: #BA0000; - text-decoration: line-through; -} -li.new { - text-decoration: line-through; -} -/** - * Overrides text justification (user preference) - * See bug 31990 - */ -#catlinks { - text-align: center; -} -.catlinks { - text-align: center; - width: 80%; - margin-left: auto; - margin-right: auto; - padding: 3px; -} - -#mytabs { - background-color: inherit; -} -#p-cactions { - background-color: inherit; -} - -#footer { - padding-left: 11.8em; -} - -#n-portal, -#n-currentevents, -#n-help, -#n-sitesupport { - display: none; -} - -#preftoc { - float: left; - margin: 1em; - width: 13em; -} -#preftoc li { -} -#preftoc li.selected { - border: 1px dashed #aaa; -} -#preftoc a, -#preftoc a:active { - display: block; -} -div.htmlform-tip { - font-size: 95%; - margin-top: 1em; -} - -#mw_trackbacks { - border-style: groove; -} - -#jump-to-nav { - display: none; -} - -table.collapsed tr.collapsable { - display: none; -} - -.templatesUsed { - margin-top: 1.5em; -} - diff --git a/skins/standard/main.css b/skins/standard/main.css deleted file mode 100644 index a4b03a8729..0000000000 --- a/skins/standard/main.css +++ /dev/null @@ -1,188 +0,0 @@ -/** - * This style sheet is used by the classic (aka standard) skin - */ - -#article { - padding: 4px; -} - -#content { - margin: 0; - padding: 0; -} - -#footer { - padding: 4px; - font-size: 95%; - clear: both; -} - -#pagestats { - font-size: 9pt; -} - -#powersearch { - background: #DDEEFF; - border-style: solid; - border-width: 1px; - padding: 2px; -} - -#quickbar { - width: 140px; - height: 100%; - padding: 4px; - visibility: visible; - z-index: 99; - font-size: 95%; -} - -#topbar { - padding: 4px; - font-size: 95%; -} - -/* Table of contents */ -.toctoggle, -.editsection { - font-size: smaller; -} - -/* ... */ -#toolbar { - padding: 0; -} - -#infobox { - background: #eeeeff; - color: black; -} - -#editform { - margin-top: 1px; -} - -a.interwiki, -a.external { - color: #3366BB; -} - -a.printable { - text-decoration: underline; -} - -a.new { - color: #ba0000; -} - -a.stub { - color: #772233; - text-decoration: none; -} - -a:visited { - color: #5A3696; -} - -body { - margin: 0; - padding: 4px; - color: black; -} - -form.inline { - display: inline; -} - -textarea { - overflow: auto; -} - -h1.pagetitle { - padding-top: 0; - margin-top: 0; - padding-bottom: 0; - margin-bottom: 0; - font-size: 150%; -} - -h1.pagetitle .editsection { - font-size: 66.7%; -} - -h2 { - font-size: 120%; -} - -h2 .editsection { - font-size: 83.3%; -} - -h2, h3, h4, h5, h6 { - margin-bottom: 0; -} - -h3 { - font-size: 106.25%; -} - -h3 .editsection { - font-size: 94.1%; -} - -h4 { - font-size: 103.125%; -} - -h4 .editsection { - font-size: 97.0%; -} - -h5 { - font-size: 100%; -} - -h5 .editsection { - font-size: 100%; -} - -h6 { - font-size: 95%; -} - -h6 .editsection { - font-size: 105.3%; -} - -hr.sep { - color: gray; - height: 1px; - background-color: gray; -} - -p.subpages { - font-size: small; -} - -p.subtitle { - padding-top: 0; - margin-top: 0; -} - -.catlinks { - font-size: small; - margin-top: 0; - text-align:right; -} - -td { - empty-cells: show; -} - -td.bottom { - border-top: 1px solid gray; -} - -td.top { - border-bottom: 1px solid gray; -}