Merge commit '5d1e7'

2 files changed, 153 insertions, 50 deletions

diff --git a/skins/ArchLinux/FF2Fixes.css b/skins/ArchLinux/FF2Fixes.css
deleted file mode 100644
index c8b65f50..00000000
--- a/skins/ArchLinux/FF2Fixes.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.rtl .external, a.feedlink {
-	padding: 0 !important;
-	background: none !important;
-}
diff --git a/skins/ArchLinux/arch.css b/skins/ArchLinux/arch.css
index 3b4c38b3..9432d813 100644
--- a/skins/ArchLinux/arch.css
+++ b/skins/ArchLinux/arch.css
@@ -1,71 +1,178 @@
 /* general styling */
-body { background: #f6f9fc; }
-body, #content, table { color: #222;}
-h1, h2, h3, h4, h5 { color: #222; }
-h1 { font-weight: bold; }
-pre, code, tt { background-color: #ebf1f5; color: #222; font-family: monospace; }
-pre { border: 1px solid #bcd; overflow: auto; }
-code, tt { padding: 0.3em; }
+body {
+    background: #f6f9fc;
+}
+body,
+#content,
+table,
+h1,
+h2,
+h3,
+h4,
+h5,
+pre,
+code,
+tt {
+    color: #222;
+}
+h1 {
+    font-weight: bold;
+}
+pre,
+code,
+tt {
+    background-color: #ebf1f5;
+    font-family: monospace;
+}
+pre {
+    border: 1px solid #bcd;
+    overflow: auto;
+}
+code,
+tt {
+    /* Inline-block prevents code from wrapping when starting too close to the
+    end of a line; it also lets select the entire code line with a triple
+    click */
+    display: inline-block;
+    padding: 0 0.3em;
+    /* A border would be inherited by the default style sheets, but we don't
+    want it */
+    border-width: 0;
+    border-radius: 0;
+}
+ul,
+.portlet ul {
+    list-style-image: none;
+}
+#bodyContent table {
+    border-collapse: collapse;
+    padding: 2px;
+}
+#bodyContent td {
+    padding: 2px;
+}
 
 /* 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 > div.mw-content-ltr a, #bodyContent > div.mw-content-rtl a, #wikiPreview > div.mw-content-ltr a, #wikiPreview > div.mw-content-rtl a { font-weight: bold; }
-#bodyContent #toc a, #bodyContent .special li > a, #bodyContent .special li span a, #bodyContent #pagehistory 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; }
+#bodyContent > div.mw-content-ltr a,
+#bodyContent > div.mw-content-rtl a,
+#wikiPreview > div.mw-content-ltr a,
+#wikiPreview > div.mw-content-rtl a {
+    font-weight: bold;
+}
+#bodyContent #toc a,
+#bodyContent .special li > a,
+#bodyContent .special li span a,
+#bodyContent #pagehistory a {
+    font-weight: normal;
+}
+a:link,
+#toc a,
+#p-cactions li a,
+#p-personal li a,
+#p-cactions li a:visited,
+#p-personal li a:visited,
+#bodyContent a.external,
+#bodyContent a.extiw {
+    text-decoration: none;
+    outline: none;
+    color: #07b;
+}
+a:visited,
+#bodyContent a:visited.external {
+    color: #666;
+}
+a:hover,
+#p-personal li a:hover,
+#bodyContent #toc a:hover,
+#bodyContent a:hover.external {
+    text-decoration: underline;
+    background-color: transparent;
+    color: #999;
+}
+a:focus,
+a:active,
+#toc a:focus,
+#toc a:active,
+#p-cactions li a:focus,
+#p-cactions li a:active,
+#p-personal li a:focus,
+#p-personal li a:active,
+#bodyContent a:focus.external,
+#bodyContent a:active.external,
+#bodyContent a:focus.extiw,
+#bodyContent a:active.extiw {
+    color: #e90 !important;
+}
+a.new,
+#p-cactions .new a,
+#p-personal a.new {
+    color: #b00 !important;
+}
 
 /* bump down the personal toolbar (top menu) */
-#p-personal { top: 70px; }
+#p-personal {
+    top: 70px;
+}
 
 /* bump down the action tabs (page, discuss, edit, etc.) */
-#p-cactions { top: 7.5em; }
-/* first for IE6 */
-#p-cactions { top: 97px; }
-/* and now for the rest */
-html > body #p-cactions { top: 92px; }
+#p-cactions {
+    top: 92px;
+}
 
 /* bump down the main content to make room for navbar */
-#content { top: .8em; }
-#content { top: 10px; }
+#content {
+    top: 10px;
+}
 
 /* shrink the content just enough to show off the borders */
-div#globalWrapper { width: 99%; }
+div#globalWrapper {
+    width: 99%;
+}
 
 /* article Table of Contents */
-#toc, .toc, .mw-warning { background-color: #f9faff; border: 1px solid #d7dfe3; }
+#toc,
+.toc,
+.mw-warning {
+    background-color: #f9faff;
+    border: 1px solid #d7dfe3;
+}
 
 /* sidebar menus and content borders */
-.pBody { border: 1px solid #ddd; }
-div#content { border: 1px solid #ccc; }
+.pBody {
+    border: 1px solid #ddd;
+}
+div#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; }
+#p-logo {
+    display: none !important;
+}
+div#column-one {
+    padding-top: 36px;
+}
 
 /* disable footer logos  TODO: see if this can be done in LocalSettings.php */
-#f-poweredbyico, #f-copyrightico { display: none; }
+#f-poweredbyico,
+#f-copyrightico {
+    display: none;
+}
 
 /* clean up the footer */
-div#footer { color: #888; background-color: transparent; border-top: none; border-bottom: none; }
+div#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; }
+#footer ul {
+    margin-left: 170px;
+}
 
 /* highlight current website in the navbar */
-#archnavbar ul li.anb-selected a { color: white !important; }
-
-/* make tables prettier */
-#bodyContent table { border-collapse: collapse; padding: 2px; }
-#bodyContent td { padding: 2px; }
-
-ul, .portlet ul { list-style-image: none; }
+#archnavbar ul li.anb-selected a {
+    color: white !important;
+}