Adjust colors; simplify css integration

3 files changed, 28 insertions, 23 deletions

diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php
index 9dba72cc..8b74df2a 100644
--- a/skins/ArchLinux.php
+++ b/skins/ArchLinux.php
@@ -42,6 +42,9 @@ class SkinArchLinux extends SkinTemplate {
 		$out->addStyle( 'archlinux/IE70Fixes.css', 'screen', 'IE 7' );
 
 		$out->addStyle( 'archlinux/rtl.css', 'screen', '', 'rtl' );
+
+		$out->addStyle( 'archlinux/archnavbar.css', 'screen' );
+		$out->addStyle( 'archlinux/arch.css', 'screen' );
 	}
 }
 
@@ -81,7 +84,6 @@ class ArchLinuxTemplate extends QuickTemplate {
 		<!--[if lt IE 7]><script type="<?php $this->text('jsmimetype') ?>" src="<?php $this->text('stylepath') ?>/common/IEFixes.js?<?php echo $GLOBALS['wgStyleVersion'] ?>"></script>
 		<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>
 		<?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>
diff --git a/skins/archlinux/archlinux.css b/skins/archlinux/arch.css
index 4869664a..2e04fef9 100644
--- a/skins/archlinux/archlinux.css
+++ b/skins/archlinux/arch.css
@@ -1,29 +1,22 @@
-/*
- * ARCHWIKI
- *
- */
-
-/* import the global navbar stylesheet */
-@import url('archnavbar.css');
-
 /* general styling */
-body { background: #e4eeff; }
+body { background: #f6f9fc; }
 body, #content, table { color: #222;}
 h1, h2, h3, h4, h5 { color: #222; }
 h1 { font-weight: bold; }
-pre { border: 1px solid #bdb; background: #dfd; }
-code { font-family: monospace; background-color: #ffc; }
+pre { border: 1px solid #bcd; background: #ebf1f5; color: #222; }
+code { font-family: monospace; }
 
 /* links (including page tabs and personal toolbar) */
-a, #p-cactions li a { text-decoration: none; }
+a, #p-cactions li a { text-decoration: none; outline: none; }
 a:link, #p-cactions li a, #p-personal li a, #bodyContent a.external { color: #07b; }
-a:visited { color: #549; }
-a:hover, #p-personal li a:hover { text-decoration: underline; background-color: transparent; }
-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; } 
+#bodyContent p a, #bodyContent li a, #bodyContent td a { font-weight: bold; }
+#bodyContent #toc a, #bodyContent .special li > a,
+#bodyContent #toc a, #bodyContent .special li span a { font-weight: normal; }
+a:visited, #bodyContent a:visited.external { color: #666; }
+a:focus { color: #e90 !important; }
+a:hover, #p-personal li a:hover, #bodyContent #toc a:hover, #bodyContent a:hover.external { text-decoration: underline; background-color: transparent; color: #999; }
+a:active { color: #e90 !important; }
+a.new, #p-cactions .new a { color: #b00 !important; }
 
 /* bump down the personal toolbar (top menu) */
 #p-personal { top: 70px; }
@@ -74,9 +67,19 @@ html > body #footer ul { margin-left: 170px; }
 /* highlight current website in the navbar */
 #archnavbar ul li#anb-wiki a { color: white !important; }
 
+/* highlight main menu links (specific to archlinux.de) */
+.page-Download #archnavbar ul li#anb-download a { color: white !important; }
+.page-Download #archnavbar ul li#anb-wiki a { color: #999 !important; }
+.page-Download #archnavbar ul li#anb-wiki a:hover { color: #fff !important; }
+.page-Spenden #archnavbar ul li#anb-spenden a { color: white !important; }
+.page-Spenden #archnavbar ul li#anb-wiki a { color: #999 !important; }
+.page-Spenden #archnavbar ul li#anb-wiki a:hover { color: #fff !important; }
+
 /* don't highlight https links */
 #bodyContent a[href ^="https://"], .link-https { background: none; padding: 0; }
 
 /* make tables prettier */
-#bodyContent table { border-collapse: collapse; padding: 4px; }
-#bodyContent td { padding: 4px; }
+#bodyContent table { border-collapse: collapse; padding: 2px; }
+#bodyContent td { padding: 2px; }
+
+ul, .portlet ul { list-style-image: none; }
diff --git a/skins/archlinux/archnavbar.css b/skins/archlinux/archnavbar.css
index 0a729ef4..d95832bc 100644
--- a/skins/archlinux/archnavbar.css
+++ b/skins/archlinux/archnavbar.css
@@ -28,6 +28,6 @@ html > body #archnavbarlogo { background: url('archlogo.png') no-repeat !importa
 #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#archnavbarlist li a { color: #999; font-weight: bold !important; text-decoration: none !important; }
 #archnavbar ul li a:hover { color: white !important; text-decoration: underline !important; }