summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2010-03-04 00:31:49 +0100
committerPierre Schmitz <pierre@archlinux.de>2010-03-04 00:31:49 +0100
commitf1b5d9d91bf833e4d74ebd9d28525e8be8cf22b1 (patch)
treed968d2cc5d99b51801262000e8062fd439cf2b36
parente6475b0b814e9cb5d1b65dd76eee371875fffa9a (diff)
Initial import of Thayer's redesign
Imported css and logo files from http://projects.archlinux.org/users/thayer/archweb-branding.git/ (commit 50c71078b206150f852eb91121400cb1690466f5) Content of archnavbar.html was applied to ArchLinux.php.
l---------[-rw-r--r--]favicon.icobin1150 -> 27 bytes
-rw-r--r--skins/ArchLinux.php29
-rw-r--r--skins/archlinux/archlinux.css348
-rw-r--r--skins/archlinux/archlogo.gifbin0 -> 1845 bytes
-rw-r--r--skins/archlinux/archlogo.pngbin0 -> 4192 bytes
-rw-r--r--skins/archlinux/archnavbar.css32
-rw-r--r--skins/archlinux/favicon.icobin0 -> 575 bytes
-rw-r--r--skins/archlinux/logo-de.pngbin8241 -> 0 bytes
-rw-r--r--skins/archlinux/logo-en.pngbin4502 -> 0 bytes
9 files changed, 120 insertions, 289 deletions
diff --git a/favicon.ico b/favicon.ico
index 24d9fda9..104469a3 100644..120000
--- a/favicon.ico
+++ b/favicon.ico
Binary files differ
diff --git a/skins/ArchLinux.php b/skins/ArchLinux.php
index cd0fecfe..63aa6516 100644
--- a/skins/ArchLinux.php
+++ b/skins/ArchLinux.php
@@ -110,26 +110,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">
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
new file mode 100644
index 00000000..e1852a06
--- /dev/null
+++ b/skins/archlinux/archlogo.gif
Binary files differ
diff --git a/skins/archlinux/archlogo.png b/skins/archlinux/archlogo.png
new file mode 100644
index 00000000..e873e94b
--- /dev/null
+++ b/skins/archlinux/archlogo.png
Binary files differ
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
new file mode 100644
index 00000000..55497b85
--- /dev/null
+++ b/skins/archlinux/favicon.ico
Binary files differ
diff --git a/skins/archlinux/logo-de.png b/skins/archlinux/logo-de.png
deleted file mode 100644
index 32467a84..00000000
--- a/skins/archlinux/logo-de.png
+++ /dev/null
Binary files differ
diff --git a/skins/archlinux/logo-en.png b/skins/archlinux/logo-en.png
deleted file mode 100644
index be7f14c7..00000000
--- a/skins/archlinux/logo-en.png
+++ /dev/null
Binary files differ