diff options
l---------[-rw-r--r--] | favicon.ico | bin | 1150 -> 27 bytes | |||
-rw-r--r-- | skins/ArchLinux.php | 60 | ||||
-rw-r--r-- | skins/archlinux/archlinux.css | 348 | ||||
-rw-r--r-- | skins/archlinux/archlogo.gif | bin | 0 -> 1845 bytes | |||
-rw-r--r-- | skins/archlinux/archlogo.png | bin | 0 -> 4192 bytes | |||
-rw-r--r-- | skins/archlinux/archnavbar.css | 32 | ||||
-rw-r--r-- | skins/archlinux/favicon.ico | bin | 0 -> 575 bytes | |||
-rw-r--r-- | skins/archlinux/logo-de.png | bin | 8241 -> 0 bytes | |||
-rw-r--r-- | skins/archlinux/logo-en.png | bin | 4502 -> 0 bytes |
9 files changed, 141 insertions, 299 deletions
diff --git a/favicon.ico b/favicon.ico Binary files differindex 24d9fda9..104469a3 100644..120000 --- a/favicon.ico +++ b/favicon.ico diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php index cd0fecfe..9dba72cc 100644 --- a/skins/ArchLinux.php +++ b/skins/ArchLinux.php @@ -60,7 +60,7 @@ class ArchLinuxTemplate extends QuickTemplate { * @access private */ function execute() { - global $wgRequest, $wgArchNavBar, $wgArchNavBarSelected; + global $wgRequest, $wgArchNavBar; $this->skin = $skin = $this->data['skin']; $action = $wgRequest->getText( 'action' ); @@ -68,7 +68,7 @@ class ArchLinuxTemplate extends QuickTemplate { wfSuppressWarnings(); ?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php +<html xmlns="<?php $this->text('xhtmldefaultnamespace') ?>" <?php foreach($this->data['xhtmlnamespaces'] as $tag => $ns) { ?>xmlns:<?php echo "{$tag}=\"{$ns}\" "; } ?>xml:lang="<?php $this->text('lang') ?>" lang="<?php $this->text('lang') ?>" dir="<?php $this->text('dir') ?>"> @@ -82,7 +82,6 @@ class ArchLinuxTemplate extends QuickTemplate { <meta http-equiv="imagetoolbar" content="no" /><![endif]--> <style type="text/css" media="screen">@import "<?php $this->text('stylepath') ?>/<?php $this->text('stylename') ?>/archlinux.css?<?php echo $GLOBALS['wgStyleVersion'] ?>";</style> - <!--[if lt IE 7]><style type="text/css">#content{margin-bottom: 185px;} #p-cactions{top: 190px;} #p-personal{height:26px; top:149px;}</style><![endif]--> <?php print Skin::makeGlobalVariablesScript( $this->data ); ?> <script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath' ) ?>/common/wikibits.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"><!-- wikibits js --></script> @@ -110,26 +109,23 @@ class ArchLinuxTemplate extends QuickTemplate { class="mediawiki <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinnameclass') ?>"> <?php if (empty($_REQUEST['printable'])) {?> - <a id="logo" style="background-image: url(<?php $this->text('logopath') ?>);" <?php - ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php - echo $skin->tooltipAndAccesskey('p-logo') ?>></a> - <div id="nav_bar"> - <ul id="nav"> - <?php + <div id="archnavbar"><!-- Arch Linux global navigation bar --> + <div id="archnavbarlogo"> + <p><a id="logo" href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php + echo $skin->tooltipAndAccesskey('p-logo') ?>></a></p> + </div> + <div id="archnavbarmenu"> + <ul id="archnavbarlist"> + <?php if (isset($wgArchNavBar)) { foreach ($wgArchNavBar as $name => $url) { - if (isset($wgArchNavBarSelected) && $name == $wgArchNavBarSelected) { - $selected = ' class="selected"'; - } else { - $selected = ''; - } - echo '<li'.$selected.'><a href="'.$url.'">'.$name.'</a></li>'; + echo '<li id="anb-'.strtolower($name).'"><a href="'.$url.'">'.$name.'</a></li>'; } } - ?> - </ul> - </div> - <div id="subnav_bar"></div> + ?> + </ul> + </div> + </div><!-- #archnavbar --> <?php } ?> <div id="globalWrapper"> @@ -197,9 +193,14 @@ class ArchLinuxTemplate extends QuickTemplate { </ul> </div> </div> + <div class="portlet" id="p-logo"> + <a style="background-image: url(<?php $this->text('logopath') ?>);" <?php + ?>href="<?php echo htmlspecialchars($this->data['nav_urls']['mainpage']['href'])?>"<?php + echo $skin->tooltipAndAccesskey('p-logo') ?>></a> + </div> <script type="<?php $this->text('jsmimetype') ?>"> if (window.isMSIE55) fixalpha(); </script> -<?php - $sidebar = $this->data['sidebar']; +<?php + $sidebar = $this->data['sidebar']; if ( !isset( $sidebar['SEARCH'] ) ) $sidebar['SEARCH'] = true; if ( !isset( $sidebar['TOOLBOX'] ) ) $sidebar['TOOLBOX'] = true; if ( !isset( $sidebar['LANGUAGES'] ) ) $sidebar['LANGUAGES'] = true; @@ -219,6 +220,13 @@ class ArchLinuxTemplate extends QuickTemplate { <div class="visualClear"></div> <div id="footer"> <?php + if($this->data['poweredbyico']) { ?> + <div id="f-poweredbyico"><?php $this->html('poweredbyico') ?></div> +<?php } + if($this->data['copyrightico']) { ?> + <div id="f-copyrightico"><?php $this->html('copyrightico') ?></div> +<?php } + // Generate additional footer links $footerlinks = array( 'lastmod', 'viewcount', 'numberofwatchingusers', 'credits', 'copyright', @@ -227,7 +235,7 @@ class ArchLinuxTemplate extends QuickTemplate { $validFooterLinks = array(); foreach( $footerlinks as $aLink ) { if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) { - $validFooterLinks[] = $aLink; + $validFooterLinks[] = $aLink; } } if ( count( $validFooterLinks ) > 0 ) { @@ -235,9 +243,9 @@ class ArchLinuxTemplate extends QuickTemplate { <?php foreach( $validFooterLinks as $aLink ) { if( isset( $this->data[$aLink] ) && $this->data[$aLink] ) { -?> <li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li> -<?php } - } +?> <li id="<?php echo$aLink?>"><?php $this->html($aLink) ?></li> +<?php } + } ?> </ul> <?php } @@ -342,7 +350,7 @@ class ArchLinuxTemplate extends QuickTemplate { /*************************************************************************************************/ function languageBox() { - if( $this->data['language_urls'] ) { + if( $this->data['language_urls'] ) { ?> <div id="p-lang" class="portlet"> <h5><?php $this->msg('otherlanguages') ?></h5> diff --git a/skins/archlinux/archlinux.css b/skins/archlinux/archlinux.css index 802315d3..14e593d9 100644 --- a/skins/archlinux/archlinux.css +++ b/skins/archlinux/archlinux.css @@ -1,274 +1,76 @@ -body { - margin: 0; - padding: 0; - padding-left: 30px; - padding-right: 30px; - color: #46494d; - background: #ffffff; - font-size: 10px; - font-family: sans-serif; -} +/* + * ARCHWIKI + * + */ + +/* import the global navbar stylesheet */ +@import url('archnavbar.css'); + +/* general styling */ +body { background: #eef; } +body, #content, table { color: #444;} +h1, h2, h3, h4, h5 { color: #444; } +h1 { font-weight: bold; } +pre { border: 1px solid #bdb; background: #dfd; } +code { font-family: monospace; background-color: #ffc; } + +/* links (including page tabs and personal toolbar) */ +a, #p-cactions li a { text-decoration: none; } +a:link, #p-cactions li a, #p-personal li a, #bodyContent a.external { color: #07b; } +a:visited { color: #838; } +a:hover, #p-personal li a:hover { text-decoration: underline; } +a:active { color: #e90; } +a.new, #p-cactions .new a { color: #d00 !important; } + +/* lessen eye strain in main edit window */ +textarea#wpTextbox1 {background: #ffc; border: 1px solid #bbb; } + +/* bump down the personal toolbar (top menu) */ +#p-personal { top: 70px; } + +/* bump down the action tabs (page, discuss, edit, etc.) */ +#p-cactions { top: 7.5em; } +/* first for IE6 */ +#p-cactions { top: 87px; } +/* and now for the rest */ +html > body #p-cactions { top: 92px; } + +/* bump down the main content to make room for navbar */ +#content { margin-top: 3.6em; } +#content { margin-top: 46px; } + +/* shrink the content just enough to show off the borders */ +#globalWrapper { width: 99%; } + +/* article Table of Contents */ +#toc, .toc, .mw-warning { background-color: #f9faff; border: 1px solid #d7dfe3; } + +/* sidebar menus and content borders */ +.pBody { border: 1px solid #ddd; } +#content { border: 1px solid #ccc; } + +/* disable default mediawiki logo and close the gap it leaves behind */ +#p-logo { display: none !important;} +/* first for IE6 */ +#column-one { padding-top: 90px; } +/* and now for the browsers that work like they should */ +html > body #column-one { padding-top: 36px; } + +/* bold the sidebar headings */ +.portlet h5 { font-weight: bold; } + +/* disable footer logos TODO: see if this can be done in LocalSettings.php */ +#f-poweredbyico, #f-copyrightico { display: none; } + +/* clean up the footer */ +#footer { color: #888; background-color: transparent; border-top: none; border-bottom: none; } + +/* bring footer text inline with content */ +/* first for IE6 */ +#footer ul { margin-left: 0; } +/* and now for the other browsers that work properly */ +html > body #footer ul { margin-left: 170px; } + +/* highlight current website in the navbar */ +#archnavbar ul li#anb-wiki a { color: white !important; } -a { - color: #0771a6; - text-decoration: none; -} - -a:visited { - color: #0771a6; -} - -a:hover { - color: #333333; - text-decoration: underline; -} - -#logo { - margin: 0; - padding: 0; - position: absolute; - top: 10px; - left: 25px; - width: 350px; - text-indent: -9999px; - background: transparent top left no-repeat; - border:none; - width: 350px; - height: 103px; -} - -#nav_bar { - position: absolute; - top: 123px; - left:0px; - right:0px; - background: #333333; - -} - -#nav { - height:26px; - list-style: none; - margin: 0; - padding: 0; - margin-right:30px; -} - -#nav li { - display: block; - float: right; - margin: 0 3px; - padding: 0; - text-align: center; - font-size: 13px; - line-height: 26px; -} - -#nav li.selected { - background: #1793d1; - padding: 0 8px; - color: #ffffff; - font-weight: bold; -} - -#nav li a { - display: block; - padding: 0 8px; - color: #ffffff; - font-weight: bold; - text-decoration: none; -} - -#nav li a:hover { - background: #1793d1; -} - -#subnav_bar { - position:absolute; - top:149px; - left:0px; - right:0px; - height:26px; - background: #1793d1; - clear:both; -} - -/* MediaWiki: */ - -#globalWrapper { - padding-top: 12px; -} - -#content { - background-color: #F0F0F0; - border-right: 1px solid; - border-color: #D9D9D9; - color: #333333; - top: 173px; -} - -#column-one { - padding-top: 203px; -} - -#column-content { - padding-bottom:210px; -} - -#p-cactions { - top: 201px; - left: 160px; -} - -.pBody { - background-color: #FBFBFB; - border-color: #C9C9C9; -} - -#footer { - border: 1px solid #D9D9D9; - background-color: #F0F0F0; - margin: 2px 0 2px 0; - padding: 2px 0 6px 0; - font-size: 10px; -} - -h1, h2, h3, h4, h5, h6 { - color: #333333; - border-color: #0771a6; -} - -#bodyContent table { - border-collapse: collapse; - padding: 4px; -} - -#bodyContent td { - padding: 4px; -} - -#bodyContent a.external { - color: #1793D1; -} - -#p-personal { - top: 154px; - font-size:14px; - font-weight: bold; - line-height: 26px; - background: #1793d1; -} - -li#pt-userpage, -li#pt-anonuserpage, -li#pt-login { - background: #1793d1; -} - -li#pt-login { - padding-right:30px; -} - -#p-personal ul { - color: #ffffff; - text-transform: none; -} - -#p-personal li { - color: #ffffff; -} - -#p-personal li a { - color: #ffffff; - margin-left: 8px; -} - -#p-personal a.new, #p-personal a.new:visited { - color: #DBDBDB; -} - -#p-personal li a:hover { - background-color: #1793d1; - color: #DBDBDB; -} - -#p-personal li.active a:hover { - background-color: #1793d1; -} - -ul { - list-style-image: none; -} - -.portlet ul { - list-style-image: none; - color: #0771a6; -} - -.portlet li { - margin: 2px; -} - -#p-cactions li.selected { - border-color: #0771a6; -} -#p-cactions li a { - color: #0771a6; -} - -table { - background-color: #F0F0F0; -} - -div.townBox { - background-color: #F0F0F0; -} - -#p-cactions li { - background-color: #F0F0F0; - border-color: #D9D9D9; -} - -#p-cactions li.selected a { - background-color: #F0F0F0; -} - -div#userloginForm .captcha { - background-color: #F0F0F0; -} - -table.gallery { - background-color: #F0F0F0; -} - -div#searchTargetContainer { - background-color: #F0F0F0; -} - -.editExternally { - background-color: #F0F0F0; -} - -.TablePager td { - background-color: #F0F0F0 -} - -table.diff, td.diff-otitle, td.diff-ntitle { - background-color: #F0F0F0; -} - -td.diff-context { - background-color: #E0E0E0; -} - -div.noarticletext { - background-color: #E0E0E0; -} - -#p-cactions li a:hover { - background-color: #F0F0F0; -} - -div.thumb { - border-color: #F0F0F0; -}
\ No newline at end of file diff --git a/skins/archlinux/archlogo.gif b/skins/archlinux/archlogo.gif Binary files differnew file mode 100644 index 00000000..e1852a06 --- /dev/null +++ b/skins/archlinux/archlogo.gif diff --git a/skins/archlinux/archlogo.png b/skins/archlinux/archlogo.png Binary files differnew file mode 100644 index 00000000..e873e94b --- /dev/null +++ b/skins/archlinux/archlogo.png diff --git a/skins/archlinux/archnavbar.css b/skins/archlinux/archnavbar.css new file mode 100644 index 00000000..6bead704 --- /dev/null +++ b/skins/archlinux/archnavbar.css @@ -0,0 +1,32 @@ +/* + * ARCH GLOBAL NAVBAR + * + * We're forcing all generic selectors with !important + * to help prevent other stylesheets from interfering. + * + */ + +/* container for the entire bar */ +#archnavbar { height: 40px !important; padding: 10px 15px !important; background: #333 !important; border-bottom: 5px #08c solid !important; } + +/* logo trickery -- GIF for IE6 and PNG for the rest */ +#archnavbarlogo { float: left !important; margin: 0 !important; padding: 0 !important; height: 40px !important; width: 190px !important; } +/* IE6 doesn't support alpha PNGs so we serve it a GIF */ +#archnavbarlogo { background: url('archlogo.gif') no-repeat !important; } +/* and use a proper PNG for all other modern browsers */ +html > body #archnavbarlogo { background: url('archlogo.png') no-repeat !important; } + +/* move the paragraph text offscreen */ +#archnavbarlogo p { margin: 0 !important; padding: 0 !important; text-indent: -9999px !important; } + +/* make the link the same size as the logo */ +#archnavbarlogo a { display: block !important; height: 40px !important; width: 190px !important; } + +/* display the list inline, float it to the right and style it */ +#archnavbar ul { display: inline !important; float: right !important; list-style: none !important; margin: 0 !important; padding: 0 !important; } +#archnavbar ul li { float: left !important; font-size: 14px !important; font-family: sans-serif !important; line-height: 45px !important; padding-right: 15px !important; padding-left: 15px !important; } + +/* style the links */ +#archnavbar ul#archnavbarlist li a { color: #999; font-weight: normal !important; text-decoration: none !important; } +#archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; } + diff --git a/skins/archlinux/favicon.ico b/skins/archlinux/favicon.ico Binary files differnew file mode 100644 index 00000000..55497b85 --- /dev/null +++ b/skins/archlinux/favicon.ico diff --git a/skins/archlinux/logo-de.png b/skins/archlinux/logo-de.png Binary files differdeleted file mode 100644 index 32467a84..00000000 --- a/skins/archlinux/logo-de.png +++ /dev/null diff --git a/skins/archlinux/logo-en.png b/skins/archlinux/logo-en.png Binary files differdeleted file mode 100644 index be7f14c7..00000000 --- a/skins/archlinux/logo-en.png +++ /dev/null |