From 2a4d8ce6fe5d225f595e42bddd6f13a8fb3183e1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Tue, 15 Jan 2008 17:51:05 +0100 Subject: Anpassungen für neues Logo und Design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- favicon.ico | Bin 1150 -> 1150 bytes skins/ArchLinux.php | 57 +++++++-------- skins/archlinux/IE50Fixes.css | 10 +-- skins/archlinux/IE55Fixes.css | 9 +-- skins/archlinux/IE60Fixes.css | 19 +---- skins/archlinux/IE70Fixes.css | 7 +- skins/archlinux/IEMacFixes.css | 3 +- skins/archlinux/archlinux.css | 144 +++++++++++++++++++++++++++++++------ skins/archlinux/headbg.jpg | Bin 7881 -> 0 bytes skins/archlinux/logo.png | Bin 15730 -> 8244 bytes skins/archlinux/main.css | 148 ++++++++++++++++++--------------------- skins/archlinux/rtl.css | 6 +- skins/archlinux/tab.png | Bin 107 -> 0 bytes skins/archlinux/title.png | Bin 7124 -> 0 bytes skins/archlinux/title_back.png | Bin 168 -> 0 bytes skins/archlinux/wiki-indexed.png | Bin 8205 -> 0 bytes skins/archlinux/wiki.png | Bin 23064 -> 0 bytes 17 files changed, 227 insertions(+), 176 deletions(-) delete mode 100644 skins/archlinux/headbg.jpg delete mode 100644 skins/archlinux/tab.png delete mode 100644 skins/archlinux/title.png delete mode 100644 skins/archlinux/title_back.png delete mode 100644 skins/archlinux/wiki-indexed.png delete mode 100644 skins/archlinux/wiki.png diff --git a/favicon.ico b/favicon.ico index aff2d1a0..24d9fda9 100644 Binary files a/favicon.ico and b/favicon.ico differ diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php index 893ba529..b455e972 100644 --- a/skins/ArchLinux.php +++ b/skins/ArchLinux.php @@ -95,38 +95,35 @@ class ArchLinuxTemplate extends QuickTemplate { class="mediawiki text('nsclass') ?> text('dir') ?> text('pageclass') ?>"> -
-
- - Arch linux -
- + +
 
diff --git a/skins/archlinux/IE50Fixes.css b/skins/archlinux/IE50Fixes.css index 40f88da2..027e32ed 100644 --- a/skins/archlinux/IE50Fixes.css +++ b/skins/archlinux/IE50Fixes.css @@ -6,8 +6,8 @@ margin: 0 !important; float: none; } -#column-content #content { - margin-top: 6px; +#column-content #content { + margin-top: 3em; height: 1%; } #column-one { @@ -21,12 +21,6 @@ margin: 0 0 0 13.6em; } -#logo { - position: relative; - top:-1px; -} - - /* IE 5 & 5.5 interpret keyword sizes one off */ body { font-size: xx-small; } /* diff --git a/skins/archlinux/IE55Fixes.css b/skins/archlinux/IE55Fixes.css index a1d59f37..637daae1 100644 --- a/skins/archlinux/IE55Fixes.css +++ b/skins/archlinux/IE55Fixes.css @@ -8,8 +8,8 @@ #column-content #content { position: relative; z-index: 5; - margin-left: 12.2em; - margin-top: 6px; + margin-left: 12.2em; + margin-top: 3em; height: 1%; } #column-one { @@ -24,11 +24,6 @@ border-left: 1px solid #fabd23; } -#logo { - position: relative; - top:-1px; -} - /*#bodyContent div, #bodyContent pre { overflow: auto; }*/ diff --git a/skins/archlinux/IE60Fixes.css b/skins/archlinux/IE60Fixes.css index ab9cff24..6b646c70 100644 --- a/skins/archlinux/IE60Fixes.css +++ b/skins/archlinux/IE60Fixes.css @@ -8,12 +8,12 @@ } #column-content #content { margin-left: 12.2em; - margin-top: 6px; + margin-top: 3em; height: 1%; } #column-one { position: absolute; - top: 137px; + top: 0; left: 0; z-index: 4; } @@ -22,23 +22,10 @@ border-left: 1px solid #fabd23; } -#logo { - position: relative; - top:-1px; -} - /* the tabs */ - #p-personal { - position: absolute; - left: 50px; - top: -40px; - z-index: 0; - } - #p-cactions { z-index: 3; - top:0px; } #p-cactions li { @@ -63,8 +50,6 @@ padding-bottom: 0.17em; } #p-navigation a { - - top:0px; display: inline-block; width: 100%; } diff --git a/skins/archlinux/IE70Fixes.css b/skins/archlinux/IE70Fixes.css index e77bbdd8..43ff7076 100644 --- a/skins/archlinux/IE70Fixes.css +++ b/skins/archlinux/IE70Fixes.css @@ -5,13 +5,14 @@ /* This bit is needed to make links clickable... WTF */ #column-content #content { margin-left: 12.2em; - margin-top: 6px; + margin-top: 3em; height: 1%; } .rtl #column-one { /* For some reason it tries to inherit the padding-top into every div, * and I can't figure out how to get it back off. + * Margin works correctly for this use, though. */ padding-top: 0; margin-top: 160px; @@ -23,10 +24,6 @@ z-index: 3; } -#logo { - position: relative; - top:-1px; -} #p-cactions li { padding-bottom: 0 !important; diff --git a/skins/archlinux/IEMacFixes.css b/skins/archlinux/IEMacFixes.css index ac963f83..f1b05719 100644 --- a/skins/archlinux/IEMacFixes.css +++ b/skins/archlinux/IEMacFixes.css @@ -1,7 +1,6 @@ /* IE/Mac only fix stylesheet, imported from main.css */ #portal-column-content { - margin: 0 0 4.8em 0; - margin-top: 6px; + margin: 0 0 4.8em 0; float: none; } #portal-column-content #content { diff --git a/skins/archlinux/archlinux.css b/skins/archlinux/archlinux.css index eede2680..db98ff1f 100644 --- a/skins/archlinux/archlinux.css +++ b/skins/archlinux/archlinux.css @@ -1,45 +1,143 @@ -#head_container {margin: 0; padding: 0; height: 140px;} +body { + margin: 0; + padding: 0; + padding-left: 30px; + padding-right: 30px; + color: #46494d; + background: #ffffff; +/* font-size: 14px; */ + font-family: sans-serif; +} + +a { + color: #0771a6; + text-decoration: none; +} + +a:hover { + color: #333333; + text-decoration: underline; +} + +a:visited { + color: #0771a6; +} + +#logo { + margin: 0; + padding: 0; + position: absolute; + top: 10px; + left: 25px; + width: 350px; + text-indent: -9999px; + background: transparent url("logo.png") top left no-repeat; + border:none; + width: 350px; + height: 103px; +} + +#nav_bar { + position: absolute; + top: 123px; + left:0px; + right:0px; + background: #333333; + +} -#main_nav ul { +#nav { + height:26px; list-style: none; margin: 0; - padding: 20px; - padding-right: 10px; - padding-top: 48px; + padding: 0; + margin-right:30px; } -#main_nav ul li { +#nav li { display: block; float: right; - width: 67px; - height: 20px; - margin: 0; - padding-top: 2px; - margin-left: 3px; - background: url("tab.png") repeat-x bottom left #fbf8f1; + margin: 0 3px; + padding: 0; text-align: center; font-size: 13px; + line-height: 26px; } -#main_nav ul li[class~=selected] { - background: #fbf8f1; +#nav li.selected { + background: #1793d1; + padding: 0 8px; + color: #ffffff; + font-weight: bold; } -#main_nav ul li a { -color: #35526f; +#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: */ + +#content { + top: 173px; +} + +#column-one { + padding-top: 203px; +} + +#column-content { + padding-bottom:210px; +} + +#p-cactions { + top: 200px; + left: 160px; +} + +#content { + border-right: 1px solid #aaa; +} + +.pBody { + background-color: #F0F0F0; +} + +#footer { + background-color: #F0F0F0; + border-color: #AAAAAA; +} + +h1, h2, h3, h4, h5, h6 { + color: #0771a6; +} + +#bodyContent table { + border-collapse: collapse; + padding: 4px; +} -#title {margin: 0; padding: 0; - height: 140px; - float: left; +#bodyContent td { + padding: 4px; } -#logo {margin: 0; padding: 0; - float: left; - width: 140px; - height: 140px; +#bodyContent a.external { + color: #49AADB; } \ No newline at end of file diff --git a/skins/archlinux/headbg.jpg b/skins/archlinux/headbg.jpg deleted file mode 100644 index 5491c6e4..00000000 Binary files a/skins/archlinux/headbg.jpg and /dev/null differ diff --git a/skins/archlinux/logo.png b/skins/archlinux/logo.png index b2b6d863..73f8aa10 100644 Binary files a/skins/archlinux/logo.png and b/skins/archlinux/logo.png differ diff --git a/skins/archlinux/main.css b/skins/archlinux/main.css index a50f93a3..3c089ded 100644 --- a/skins/archlinux/main.css +++ b/skins/archlinux/main.css @@ -16,23 +16,21 @@ padding: 0; } #content { - margin: 3px 0 0 12.2em; + margin: 2.8em 0 0 12.2em; padding: 0 1em 1.5em 1em; position: relative; z-index: 2; } #column-one { - padding-top: 3px; + padding-top: 160px; } - #content { background: white; color: black; border: 1px solid #aaa; -/* border-right: none; */ + border-right: none; line-height: 1.5em; } - /* the left column width is specified in class .portlet */ /* Font size: @@ -42,12 +40,11 @@ */ body { - background: url("title_back.png") repeat-x top left #fbf8f1; - padding: 0px 30px; + font: x-small sans-serif; + background: #f9f9f9 url(headbg.jpg) 0 0 no-repeat; + color: black; margin: 0; - color: #46494d; - font-family: sans-serif; - font-size:10px; + padding: 0; } /* scale back up to a sane default */ @@ -72,14 +69,14 @@ table { } a { text-decoration: none; - color: #35526f; + color: #002bb8; background: none; } a:visited { -/* color: #5a3696; */ + color: #5a3696; } a:active { -/* color: #faa700; */ + color: #faa700; } a:hover { text-decoration: underline; @@ -91,39 +88,37 @@ a.new, #p-personal a.new { color: #ba0000; } a.new:visited, #p-personal a.new:visited { -/* color: #a55858; */ + color: #a55858; } img { border: none; vertical-align: middle; } - p { margin: .4em 0 .5em 0; line-height: 1.5em; } - p img { margin: 0; } hr { height: 1px; - color: #8faecd; - background-color: #8faecd; + color: #aaa; + background-color: #aaa; border: 0; margin: .2em 0 .2em 0; } h1, h2, h3, h4, h5, h6 { - color: #35526f; + color: black; background: none; font-weight: normal; margin: 0; padding-top: .5em; padding-bottom: .17em; - border-bottom: 1px dotted #8faecd; + border-bottom: 1px solid #aaa; } h1 { font-size: 188%; } h1 .editsection { font-size: 53%; } @@ -147,8 +142,7 @@ ul { list-style-type: square; margin: .3em 0 0 1.5em; padding: 0; -/* color:#8faecd; */ -/* list-style-image: url(bullet.gif); */ + list-style-image: url(bullet.gif); } ol { line-height: 1.5em; @@ -174,7 +168,7 @@ dd { } fieldset { - border: 1px solid #8faecd; + border: 1px solid #2f6fab; margin: 1em 0 1em 0; padding: 0 1em 1em; line-height: 1.5em; @@ -223,7 +217,7 @@ code { } pre { padding: 1em; - border: 1px dashed #8faecd; + border: 1px dashed #2f6fab; color: black; background-color: #f9f9f9; line-height: 1.1em; @@ -262,25 +256,10 @@ span.subpages { margin-bottom: .1em; } -table[border="1"] { -border-style:none; -border-collapse:collapse; -} - -table[border="1"] tr { -} - -table[border="1"] td { -padding:4px; -border-style:solid; -border-width:1px; -border-color:#AAAAAA; -} - /* user notification thing */ .usermessage { background-color: #ffce7b; - border: 1px solid #8faecd; + border: 1px solid #ffa500; color: black; font-weight: bold; margin: 2em 0 1em; @@ -372,7 +351,7 @@ table.small { #toc, .toc, .mw-warning { - border: 1px solid #8faecd; + border: 1px solid #aaa; background-color: #f9f9f9; padding: 5px; font-size: 95%; @@ -486,15 +465,21 @@ div.tleft { margin-right: .5em; border-width: .5em 1.4em .8em 0; } - img.thumbborder { border: 1px solid #dddddd; } - .hiddenStructure { display: none; } +/* Have a checkered background on images on the description pages and in galleries + to make transparency visible + +#file img, .gallerybox .thumb img { + background: url(Checker-16x16.png) repeat; +} +*/ + /* ** classes for special content elements like town boxes ** intended to be referenced directly from the wiki src @@ -678,7 +663,7 @@ special external link styling */ } .portlet h6 { background: #ffae2e; - border: 1px solid #8faecd; + border: 1px solid #2f6fab; border-style: solid solid none solid; padding: 0 1em 0 1em; text-transform: lowercase; @@ -690,10 +675,10 @@ special external link styling */ } .pBody { font-size: 95%; - background-color: #e1e3e6; - color: #46494d; + background-color: white; + color: black; border-collapse: collapse; - border: 1px solid #8faecd; + border: 1px solid #aaa; padding: 0 .8em .3em .5em; } .portlet h1, @@ -706,7 +691,7 @@ special external link styling */ .portlet ul { line-height: 1.5em; list-style-type: square; -/* list-style-image: url(bullet.gif); */ + list-style-image: url(bullet.gif); font-size: 95%; } .portlet li { @@ -717,6 +702,7 @@ special external link styling */ /* ** Logo properties */ + #p-logo { top: 0; left: 0; @@ -738,7 +724,6 @@ special external link styling */ background-position: 35% 50% !important; text-decoration: none; } - /* ** the navigation portlet */ @@ -771,21 +756,17 @@ special external link styling */ position: relative; z-index: 3; } - input.searchButton { margin-top: 1px; - height:20px; - width:40px; - font-size:10px; + font-size: 95%; } #searchGoButton { - padding-left: 0px; - padding-right: 0px; + padding-left: .5em; + padding-right: .5em; font-weight: bold; - width:70px; } #searchInput { - width: 120px; + width: 10.9em; margin: 0; font-size: 95%; } @@ -800,7 +781,7 @@ input.searchButton { #p-personal { position: absolute; left: 0; - top: 80px; + top: 0; z-index: 0; } #p-personal { @@ -871,7 +852,6 @@ li#pt-login { padding-left: 20px; text-transform: none; } - #p-personal ul { text-transform: lowercase; } @@ -883,8 +863,8 @@ li#pt-login { */ #p-cactions { position: absolute; - top: 137px; - left: 14.5em; + top: 1.3em; + left: 11.5em; margin: 0; white-space: nowrap; width: 76%; @@ -964,7 +944,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { border: 0; padding: 0; } - #p-cactions .hiddenStructure { display: none; } @@ -981,7 +960,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { z-index: 3; } - /* TODO: #t-iscite is only used by the Cite extension, come up with some * system which allows extensions to add to this file on the fly */ @@ -992,9 +970,9 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { ** footer */ #footer { - background-color: #f6efe0; - border-top: 1px solid #eee4cb; - border-bottom: 1px solid #eee4cb; + 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; @@ -1004,7 +982,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { display: inline; margin: 0 1.3em; } - #f-poweredbyico, #f-copyrightico { margin: 0 8px; position: relative; @@ -1026,10 +1003,10 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { width: 100%; clear: both; } -#preftoc li { background-color: #f0f0f0; +#preftoc li { + background-color: #f0f0f0; color: #000; } - #preftoc li { margin: 1px -2px 1px 2px; float: left; @@ -1043,7 +1020,6 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { list-style-image: none; z-index: 3; } - #preftoc li.selected { font-weight: bold; background-color: #f9f9f9; @@ -1091,22 +1067,19 @@ li#ca-watch, li#ca-unwatch, li#ca-varlang-0, li#ca-print { margin-right: 2em; } .prefsection legend { - font-weight: bold; + font-weight: bold; } .prefsection table, .prefsection legend { background-color: #F9F9F9; } - .mainLegend { display: none; } - div.prefsectiontip { font-size: x-small; padding: .2em 2em; color: #666; } - .btnSavePrefs { font-weight: bold; padding-left: .3em; @@ -1191,7 +1164,6 @@ div#userloginForm .captcha { padding-bottom: 25px; } - /* more IE fixes */ /* float/negative margin brokenness */ * html #footer {margin-top: 0;} @@ -1266,9 +1238,9 @@ table.gallery td { background-color: #f9f9f9; border: solid 2px white; } - +/* Keep this temporarily so that cached pages will display right */ table.gallery td.galleryheader { - text-align: center; + text-align: center; font-weight: bold; } table.gallery caption { @@ -1543,7 +1515,6 @@ tr.sv-space{ } tr.sv-space td { display: none; } - /* Table pager (e.g. Special:Imagelist) - remove underlines from the navigation link @@ -1554,9 +1525,9 @@ tr.sv-space td { display: none; } */ .TablePager_nav a { text-decoration: none; } .TablePager { border-collapse: collapse; } -.TablePager, .TablePager td, .TablePager th { - border: 1px solid #aaaaaa; - padding: 0 0.15em 0 0.15em; +.TablePager, .TablePager td, .TablePager th { + border: 1px solid #aaaaaa; + padding: 0 0.15em 0 0.15em; } .TablePager th { background-color: #eeeeff } .TablePager td { background-color: #ffffff } @@ -1573,6 +1544,12 @@ tr.sv-space td { display: none; } margin: 0.1em 0; } +/* Convenience links on Special:Ipblocklist */ +p.mw-ipb-conveniencelinks { + font-size: 90%; + float: right; +} + /* Friendlier slave lag warnings */ div.mw-lag-warn-normal, div.mw-lag-warn-high { @@ -1598,4 +1575,13 @@ div#mw-recreate-deleted-warn { } div#mw-recreate-deleted-warn ul li { font-size: 90%; +} +.MediaTransformError { + background-color: #ccc; + padding: 0.1em; +} +.MediaTransformError td { + text-align: center; + vertical-align: middle; + font-size: 90%; } \ No newline at end of file diff --git a/skins/archlinux/rtl.css b/skins/archlinux/rtl.css index e84f2b9c..e28ffb75 100644 --- a/skins/archlinux/rtl.css +++ b/skins/archlinux/rtl.css @@ -170,8 +170,8 @@ li#ca-watch { margin-right: 13.6em; border-left: 0; border-right: 1px solid #fabd23; -} -* html #column-content { +} +* html #column-content { float: none; margin-left: 0; margin-right: 0; @@ -226,4 +226,4 @@ p.mw-ipb-conveniencelinks { } table.filehistory th { text-align: right; -} \ No newline at end of file +} diff --git a/skins/archlinux/tab.png b/skins/archlinux/tab.png deleted file mode 100644 index 56d2e617..00000000 Binary files a/skins/archlinux/tab.png and /dev/null differ diff --git a/skins/archlinux/title.png b/skins/archlinux/title.png deleted file mode 100644 index 2adaee1b..00000000 Binary files a/skins/archlinux/title.png and /dev/null differ diff --git a/skins/archlinux/title_back.png b/skins/archlinux/title_back.png deleted file mode 100644 index 95c98d7a..00000000 Binary files a/skins/archlinux/title_back.png and /dev/null differ diff --git a/skins/archlinux/wiki-indexed.png b/skins/archlinux/wiki-indexed.png deleted file mode 100644 index 189a2ae3..00000000 Binary files a/skins/archlinux/wiki-indexed.png and /dev/null differ diff --git a/skins/archlinux/wiki.png b/skins/archlinux/wiki.png deleted file mode 100644 index 69fce988..00000000 Binary files a/skins/archlinux/wiki.png and /dev/null differ -- cgit v1.2.3-54-g00ecf