From 2bfcc98e47108dc7431d946cc89ef37a723cfc2c Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 10 Jun 2010 17:05:49 +0200 Subject: Adjust colors; simplify css integration --- skins/ArchLinux.php | 4 +- skins/archlinux/arch.css | 85 ++++++++++++++++++++++++++++++++++++++++++ skins/archlinux/archlinux.css | 82 ---------------------------------------- skins/archlinux/archnavbar.css | 2 +- 4 files changed, 89 insertions(+), 84 deletions(-) create mode 100644 skins/archlinux/arch.css delete mode 100644 skins/archlinux/archlinux.css 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 { - data ); ?> diff --git a/skins/archlinux/arch.css b/skins/archlinux/arch.css new file mode 100644 index 00000000..2e04fef9 --- /dev/null +++ b/skins/archlinux/arch.css @@ -0,0 +1,85 @@ +/* general styling */ +body { background: #f6f9fc; } +body, #content, table { color: #222;} +h1, h2, h3, h4, h5 { color: #222; } +h1 { font-weight: bold; } +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; outline: none; } +a:link, #p-cactions li a, #p-personal li a, #bodyContent a.external { color: #07b; } +#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; } + +/* 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; } + +/* 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: 2px; } +#bodyContent td { padding: 2px; } + +ul, .portlet ul { list-style-image: none; } diff --git a/skins/archlinux/archlinux.css b/skins/archlinux/archlinux.css deleted file mode 100644 index 4869664a..00000000 --- a/skins/archlinux/archlinux.css +++ /dev/null @@ -1,82 +0,0 @@ -/* - * ARCHWIKI - * - */ - -/* import the global navbar stylesheet */ -@import url('archnavbar.css'); - -/* general styling */ -body { background: #e4eeff; } -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; } - -/* 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: #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; } - -/* 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; } - -/* 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; } 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; } -- cgit v1.2.2