From: Brion Vibber Date: Mon, 19 Dec 2005 22:52:00 +0000 (+0000) Subject: * Removed experimental Amethyst skin from default set X-Git-Tag: 1.6.0~929 X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=7c608502a8e00e2ac462beb526721c760003d8d6;p=lhc%2Fweb%2Fwiklou.git * Removed experimental Amethyst skin from default set --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index ef29a8833b..fe82f1cd25 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -334,6 +334,7 @@ fully support the editing toolbar, but was found to be too confusing. * Add a hook for additional user creation throttle / limiter extensions * Use $wgOut->parse() in wfGetSiteNotice() instead of creating a new parser instance. This allows use of extension hooks if required. +* Removed experimental Amethyst skin from default set === Caveats === diff --git a/skins/Amethyst.php b/skins/Amethyst.php deleted file mode 100644 index ed1e1d76a1..0000000000 --- a/skins/Amethyst.php +++ /dev/null @@ -1,33 +0,0 @@ -skinname = 'amethyst'; - $this->stylename = 'amethyst'; - $this->template = 'MonobookTemplate'; - } -} - -?> diff --git a/skins/amethyst/IE50Fixes.css b/skins/amethyst/IE50Fixes.css deleted file mode 100644 index dd9eda3e5f..0000000000 --- a/skins/amethyst/IE50Fixes.css +++ /dev/null @@ -1,67 +0,0 @@ -/* -** IE5.0 Fix Stylesheet -*/ - -#column-content { - margin: 0 !important; - float: none; -} -#column-content #content { - margin-top: 3em; - height: 1%; -} -#column-one { - position: absolute; - overflow: visible; - top: 0; - left: 0; - z-index: 3; -} -#footer { - margin: 0 0 0 13.6em; -} - -/* IE 5 & 5.5 interpret keyword sizes one off */ -body { font-size: xx-small; } -/* -** the edit tabs -*/ -#p-cactions li { - float: left; - padding-top: 0; - padding-bottom: 0 !important; - height: 0.9em; -} -#p-cactions li a { - display: block; - padding-bottom: 0.045em; -} -#p-cactions li.selected a { - padding-bottom: 0.17em; -} -#p-cactions li a:hover { - padding-bottom: 0.17em; -} -/* 5.0 doesn't like the background icon for external links and user */ -.link-external, -.external { - background: none; - padding: 0; -} -#p-personal ul { float: right } -#p-personal li { float: left } -li#pt-userpage, -li#pt-anonuserpage, -li#pt-login, -li#pt-logout { - background: none; - padding-left: none; -} -.visualClear { - width:100%; - height: 0px; - padding:0; - margin:0; -} -.firstHeading { margin-bottom: 0.3em; } -/*div{ border:1px solid Red !important;}*/ diff --git a/skins/amethyst/IE55Fixes.css b/skins/amethyst/IE55Fixes.css deleted file mode 100644 index 2f7856123a..0000000000 --- a/skins/amethyst/IE55Fixes.css +++ /dev/null @@ -1,81 +0,0 @@ -/* IE5.5/win- only fixes */ - -#column-content { - float: none; - margin-left: 0; - height: 1%; -} -#column-content #content { - position: relative; - z-index: 5; - margin-left: 12.2em; - margin-top: 3em; - height: 1%; -} -#column-one { - position: absolute; - top: 0; - left: 0; - z-index: 4; - width: 100%; -} -#footer { - margin-left: 13.6em; - border-left: 1px solid #fabd23; -} - -/*#bodyContent div, -#bodyContent pre { overflow: auto; }*/ - -#p-personal { padding-bottom: 0.1em; } - -body { font-size: xx-small; } - -#p-cactions { - width: 76% !important; - z-index: 3 !important; - float: none; -} -#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; -} -.portlet { - overflow:hidden; -} -#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; -} -.visualClear { - width:90%; - height: 1px; - padding:0; - margin:0; -} - -#editform { - width: 100%; -} diff --git a/skins/amethyst/IE60Fixes.css b/skins/amethyst/IE60Fixes.css deleted file mode 100644 index feec15f166..0000000000 --- a/skins/amethyst/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/amethyst/IEMacFixes.css b/skins/amethyst/IEMacFixes.css deleted file mode 100644 index faa720a318..0000000000 --- a/skins/amethyst/IEMacFixes.css +++ /dev/null @@ -1,44 +0,0 @@ -/* IE/Mac only fix stylesheet, imported from main.css */ -#portal-column-content { - margin: 0 0 4.8em 0; - float: none; -} -#portal-column-content #content { - z-index: 0; -} -#portal-column-one { - position: absolute; - top:0; - left:0; - z-index: 3; -} -#portal-footer { - margin-left: 12em; -} -/* -#portlet-contentViews { - top: 0.6em !important; - left: 14.5em !important; -} -*/ -#portlet-contentViews li, -#portlet-contentViews .selected { - border: none !important; -} -#portlet-contentViews li a { - border: 1px solid #aaaaaa; - border-bottom: none; -} -#portlet-contentViews li.selected a { - border: 1px solid #fabd23; - border-bottom: none; -} -/* no background images */ -li#personaltools-userpage, -li#personaltools-login/* */ { - background: none; - padding-left: none; -} -#mactest { -color: Green; -} diff --git a/skins/amethyst/article.png b/skins/amethyst/article.png deleted file mode 100644 index 17db6e6cf5..0000000000 Binary files a/skins/amethyst/article.png and /dev/null differ diff --git a/skins/amethyst/chat.png b/skins/amethyst/chat.png deleted file mode 100644 index 59742d1566..0000000000 Binary files a/skins/amethyst/chat.png and /dev/null differ diff --git a/skins/amethyst/configure.png b/skins/amethyst/configure.png deleted file mode 100644 index 0855421e78..0000000000 Binary files a/skins/amethyst/configure.png and /dev/null differ diff --git a/skins/amethyst/connect.png b/skins/amethyst/connect.png deleted file mode 100644 index b0cc357988..0000000000 Binary files a/skins/amethyst/connect.png and /dev/null differ diff --git a/skins/amethyst/connected.png b/skins/amethyst/connected.png deleted file mode 100644 index aa584ac3e7..0000000000 Binary files a/skins/amethyst/connected.png and /dev/null differ diff --git a/skins/amethyst/currentevents.png b/skins/amethyst/currentevents.png deleted file mode 100644 index c1b429762d..0000000000 Binary files a/skins/amethyst/currentevents.png and /dev/null differ diff --git a/skins/amethyst/delete.png b/skins/amethyst/delete.png deleted file mode 100644 index eadb9c1d23..0000000000 Binary files a/skins/amethyst/delete.png and /dev/null differ diff --git a/skins/amethyst/edit.png b/skins/amethyst/edit.png deleted file mode 100644 index df72d52113..0000000000 Binary files a/skins/amethyst/edit.png and /dev/null differ diff --git a/skins/amethyst/gear.png b/skins/amethyst/gear.png deleted file mode 100644 index 8d80dc335b..0000000000 Binary files a/skins/amethyst/gear.png and /dev/null differ diff --git a/skins/amethyst/help.png b/skins/amethyst/help.png deleted file mode 100644 index 673e0601bb..0000000000 Binary files a/skins/amethyst/help.png and /dev/null differ diff --git a/skins/amethyst/history.png b/skins/amethyst/history.png deleted file mode 100644 index 19ba384581..0000000000 Binary files a/skins/amethyst/history.png and /dev/null differ diff --git a/skins/amethyst/lock.png b/skins/amethyst/lock.png deleted file mode 100644 index d1aeaeadef..0000000000 Binary files a/skins/amethyst/lock.png and /dev/null differ diff --git a/skins/amethyst/main.css b/skins/amethyst/main.css deleted file mode 100644 index de204460a0..0000000000 --- a/skins/amethyst/main.css +++ /dev/null @@ -1,315 +0,0 @@ -/* Amethyst stylesheet for mediawiki. - * - * Copyright Big John, Gabriel Wicke, Sorwena, Sorkhiri, Ashar Voultoiz - * - * License: GPL (http://www.gnu.org/copyleft/gpl.html) - * - * Based on MonoBook by Gwicke itself based on a Plone 2.0 skin. - * Colors by Sorwena and Sorkhiri guild. - * Adapted for MediaWiki by Ashar Voultoiz. - * - * Icons from Gartoon Gnome Icon pack - * Created by Zeus (zeussama@yahoo.com) http://zeus.qballcow.nl - * License: GPL - * - * - * NOTE: Internet Explorer is not able to correctly render this - * skin. Complain to your local software reseller or use an up - * to date browser such as Mozilla Firefox. - */ -BODY { margin : 0; padding: 0; background : black; color:white;} -div { font-size : small; } -pre { - border: 1px dashed #2A3C61; - color:white; - background-color: #2A3C61; - overflow : auto; -} -input,select { border: 1px solid #CCCCCC;} -textarea {border: 1px solid #CCCCCC;font-size:small; width : 100%;} - -a { color: yellow; text-decoration: none; } -a:visited { color: #C0C000; text-decoration: none;} -a:hover { text-decoration: underline; } - -img { border:none; vertical-align:middle; } -li { margin-bottom: .1em; } -p img { margin: 0;} - -H1.firstHeading { text-align: center; } - -#column-content { - width:100%; - float:left; - margin: 0 0 0 -12em; - padding : 0; - display:table-cell; -} - -#content { - background : #2F333B; - color : white; - margin: 5em 1em 1em 13em; - padding: 0 1em 1.5em 1em; - position: relative; -} - -#column-one { - padding-top: 170px; - display:table-cell; -} - -#globalWrapper { width:100%; margin:0; padding:0; } -.visualClear { clear : both;} - -.pBody { - font-size:96%; - background-color: #2F333B; -} -.portlet { - border: none; - margin-bottom: 1em; - padding: 0; - float: none; - width: 13em; - overflow: hidden; - font-size: 85%; - background-color: #2F333B; -} -.portlet h5 { - background-color: #2A3C61; - font-size:100%; - border-bottom : 1px solid white; - padding-bottom: .1em; - margin:0; -} -.portlet ul { - margin : 1em 0 1em 0; padding:0; - list-style: none; -} -.portlet li { margin-left:1em;} - -#p-navigation div.pBody { background-color:transparent;} -#p-navigation { - width : 100%; - white-space:nowrap; - position : absolute; - left: 0; top: 0; - margin:0; padding:0 0 .2em 0; - background-color: #2A3C61; - color: white; - border-bottom : 1px solid white; -} -#p-navigation h5 { display : none;} -#p-navigation ul { - margin : 0 ; padding:0; - list-style: none; -} -#p-navigation li { - margin:0 1em 0 0; - display : inline; - font-weight : bold; -} -#p-navigation a { color:white; } -#p-navigation a : visited { color:#D0D0D0; } -li#n-mainpage a{padding-left: 18px;background:url('mainpage.png') top left no-repeat; } -li#n-portal a{padding-left: 18px;background:url('portal.png') top left no-repeat; } -li#n-currentevents a{padding-left: 18px;background:url('currentevents.png') top left no-repeat; } -li#n-recentchanges a{padding-left: 18px;background:url('recentchanges.png') top left no-repeat; } -li#n-help a{padding-left: 18px;background:url('help.png') top left no-repeat; } -li#n-randompage a{padding-left: 18px;background:url('random.png') top left no-repeat; } -li#n-sitesupport a{padding-left: 18px;background:url('sitesupport.png') top left no-repeat; } - - -#p-cactions { - width : 100%; - position : absolute; - left: 0; top: 4.2em; - margin:0; padding: 0; - background-color:transparent; -} -#p-cactions h5 { display : none; } -#p-cactions ul { - display : inline; - margin : 0; padding-left:.5em; - list-style:none; -} -#p-cactions li { - display : inline; - font-size: 96%; -} - -#p-cactions li a { color : white;} -#p-cactions .new a { color : red;} -li#ca-delete a{padding-left: 18px;background:url('delete.png') top left no-repeat; } -li#ca-edit a{padding-left: 18px;background:url('edit.png') top left no-repeat; } -li#ca-history a{padding-left: 18px;background:url('history.png') top left no-repeat; } -li#ca-talk a{padding-left: 18px;background:url('chat.png') top left no-repeat; } -li#ca-move a{padding-left: 18px;background:url('move.png') top left no-repeat; } -li#ca-nstab-main a{padding-left: 18px;background:url('nstab-main.png') top left no-repeat; } -li#ca-nstab-user a{padding-left: 18px;background:url('nstab-user.png') top left no-repeat; } -li#ca-nstab-wp a{padding-left: 18px;background:url('nstab-wp.png') top left no-repeat; } -li#ca-article a{padding-left: 18px;background:url('article.png') top left no-repeat; } -li#ca-protect a{padding-left: 18px;background:url('lock.png') top left no-repeat; } -li#ca-unprotect a{padding-left: 18px;background:url('unlock.png') top left no-repeat; } -li#ca-watch a{padding-left: 18px;background:url('watch.png') top left no-repeat; } -li#ca-unwatch a{padding-left: 18px;background:url('unwatch.png') top left no-repeat; } - - -/* other boxes */ -#p-search { display :none; } -#p-tb li a { color : white;} -li#t-print {padding-left: 18px;background:url('printer.png') top left no-repeat; } -li#t-specialpages a{padding-left: 18px;background:url('gear.png') top left no-repeat; } -li#t-upload {padding-left: 18px;background:url('upload.png') top left no-repeat; } - - -#p-personal li a { color : white;} -#p-personal li a.new { color : red;} -li#pt-userpage a{padding-left: 18px;background:url('user.png') top left no-repeat; } -li#pt-anonuserpage a{padding-left: 18px;background:url('user.png') top left no-repeat; } -li#pt-mytalk a{padding-left: 18px;background:url('chat.png') top left no-repeat; } -li#pt-anontalk a{padding-left: 18px;background:url('chat.png') top left no-repeat; } -li#pt-preferences a{padding-left: 18px;background:url('configure.png') top left no-repeat; } -li#pt-logout a{padding-left: 18px;background:url('connect.png') top left no-repeat; } -li#pt-anonlogin a{padding-left: 18px;background:url('connected.png') top left no-repeat; } - -.printfooter { display : none; } - -#footer { - clear:both; - background-color: #2A3C61; - color:#D0D0D0; - border-top: 1px solid white; - border-bottom: 1px solid white; - text-align: center; - font-size: x-small; - margin:1em 0 1em 0; -} -#footer li { display:inline; } -#f-poweredbyico { float:right;} -#f-copyrightico { float: left;} - -#p-logo { - background-color:transparent; - z-index: 3; - position: absolute; /*needed to use z-index */ - top: 1.3em; right: 1em; - height: 155px; - width: 12em; - overflow: visible; -} -#p-logo h5 { display: none; } -#p-logo a, -#p-logo a:hover { - display: block; - height: 155px; - width: 12em; - background-repeat: no-repeat; - background-position: 35% 50% !important; - text-decoration: none; -} - - - -/* END OF GENERAL LAYOUT */ - - -/* CONTENT STYLE */ -#preftoc { - float:left; - margin: 1em; - width:12em; - font-size:96%; -} - -#preferences ul { padding:.7em 0 0 1em; margin:0;} -#preftoc li { list-style:none; border: 1px solid #C0C0C0;} -#preftoc li.selected { background-color: #2A3C61;} -#preftoc a, -#preftoc a:active { - display:block; - color : white; -} -div.prefsectiontip { font-size:95%; margin-top:1em;} -#prefcontrol { clear:both; float:left; margin-top:1em; margin-left:13em;} - - -.toc { - border : 1px solid black; - background-color: #2A3C61; - padding: 5px; - font-size:small; -} -#toc h2, .toc h2 { - display:inline; - border:none; - padding: 0; - font-size:100%; - font-weight:bold; -} - -#toc #toctitle, -.toc #toctitle, -#toc .toctitle, -.toc .toctitle { - text-align: center; -} -#toc ul, -.toc ul { - list-style-type: none; - list-style-image: none; - margin-left: 0; - padding-left: 0; - text-align: left; -} -#toc ul ul, -.toc ul ul { - margin: 0 0 0 2em; -} -#toc .toctoggle, -.toc .toctoggle { - font-size: x-small; -} - -#siteSub { display:none; } - -#catlinks { - border: 1px solid #aaa; - background-color: #2A3C61; - margin : 1em -1em -1.5em -1em; - padding : .5em; - clear: both; -} - - -table.diff, td.diff-otitle, td.diff-ntitle { - color:white; -} -td.diff-addedline { - color:black; - background: #9BC4AB; - font-size: smaller; -} -td.diff-deletedline { - color:black; - background: #D3D79B; - font-size: smaller; -} -td.diff-context { - color:white; - background: #2A3C61; - font-size: smaller; -} -span.diffchange { - color: red; - font-weight: bold; -} - -#jump-to-nav { - display: none; -} - -table.collapsed tr.collapsable { - display: none; -} diff --git a/skins/amethyst/mainpage.png b/skins/amethyst/mainpage.png deleted file mode 100644 index a0d668b765..0000000000 Binary files a/skins/amethyst/mainpage.png and /dev/null differ diff --git a/skins/amethyst/move.png b/skins/amethyst/move.png deleted file mode 100644 index 439026a642..0000000000 Binary files a/skins/amethyst/move.png and /dev/null differ diff --git a/skins/amethyst/nstab-main.png b/skins/amethyst/nstab-main.png deleted file mode 100644 index 015e6b7151..0000000000 Binary files a/skins/amethyst/nstab-main.png and /dev/null differ diff --git a/skins/amethyst/nstab-user.png b/skins/amethyst/nstab-user.png deleted file mode 100644 index b0441dcf2b..0000000000 Binary files a/skins/amethyst/nstab-user.png and /dev/null differ diff --git a/skins/amethyst/nstab-wp.png b/skins/amethyst/nstab-wp.png deleted file mode 100644 index 7a7bb6aee5..0000000000 Binary files a/skins/amethyst/nstab-wp.png and /dev/null differ diff --git a/skins/amethyst/portal.png b/skins/amethyst/portal.png deleted file mode 100644 index 1d84f66882..0000000000 Binary files a/skins/amethyst/portal.png and /dev/null differ diff --git a/skins/amethyst/printer.png b/skins/amethyst/printer.png deleted file mode 100644 index d1685492d2..0000000000 Binary files a/skins/amethyst/printer.png and /dev/null differ diff --git a/skins/amethyst/random.png b/skins/amethyst/random.png deleted file mode 100644 index bc99a0ae6c..0000000000 Binary files a/skins/amethyst/random.png and /dev/null differ diff --git a/skins/amethyst/recentchanges.png b/skins/amethyst/recentchanges.png deleted file mode 100644 index fcc401dc78..0000000000 Binary files a/skins/amethyst/recentchanges.png and /dev/null differ diff --git a/skins/amethyst/sitesupport.png b/skins/amethyst/sitesupport.png deleted file mode 100644 index 6ec1ddf978..0000000000 Binary files a/skins/amethyst/sitesupport.png and /dev/null differ diff --git a/skins/amethyst/unlock.png b/skins/amethyst/unlock.png deleted file mode 100644 index 193af91a0c..0000000000 Binary files a/skins/amethyst/unlock.png and /dev/null differ diff --git a/skins/amethyst/unwatch.png b/skins/amethyst/unwatch.png deleted file mode 100644 index b0bddc244b..0000000000 Binary files a/skins/amethyst/unwatch.png and /dev/null differ diff --git a/skins/amethyst/upload.png b/skins/amethyst/upload.png deleted file mode 100644 index 3f4605c320..0000000000 Binary files a/skins/amethyst/upload.png and /dev/null differ diff --git a/skins/amethyst/user.png b/skins/amethyst/user.png deleted file mode 100644 index dc9293684c..0000000000 Binary files a/skins/amethyst/user.png and /dev/null differ diff --git a/skins/amethyst/watch.png b/skins/amethyst/watch.png deleted file mode 100644 index 6c22f5cdaf..0000000000 Binary files a/skins/amethyst/watch.png and /dev/null differ diff --git a/skins/disabled/Amethyst.php b/skins/disabled/Amethyst.php index 15767a256d..ed1e1d76a1 100644 --- a/skins/disabled/Amethyst.php +++ b/skins/disabled/Amethyst.php @@ -1,39 +1,33 @@ guild - * Ported to MediaWiki by Ashar Voultoiz + * Amethyst * - * See skin.txt for documentation + * Reuse the MonoBook template (originally a plone style + * ported on MediaWiki by Gabriel Wicke). * * @todo document - * @package MediaWiki * @subpackage Skins */ if( !defined( 'MEDIAWIKI' ) ) die(); -/** */ -require_once('includes/SkinPHPTal.php'); -if( class_exists( 'SkinPHPTal' ) ) { +/** Skin reuse monobook template */ +require_once('MonoBook.php'); /** - * See skin.txt - * + * Inherit main code from SkinTemplate, set the CSS and template filter. * @todo document - * @package MediaWiki * @subpackage Skins */ -class SkinAmethyst extends SkinPHPTal { +class SkinAmethyst extends SkinTemplate { + /** Using monobook. */ function initPage( &$out ) { - SkinPHPTal::initPage( $out ); + SkinTemplate::initPage( $out ); $this->skinname = 'amethyst'; $this->stylename = 'amethyst'; - $this->template = 'Amethyst'; + $this->template = 'MonobookTemplate'; } } -} ?>