1 files changed, 106 insertions, 65 deletions

diff --git a/skins/cologneblue/screen.css b/skins/cologneblue/screen.css
index 57b5410e..349638aa 100644
--- a/skins/cologneblue/screen.css
+++ b/skins/cologneblue/screen.css
@@ -2,6 +2,7 @@ body {
 	margin: 0;
 	padding: 0;
 	color: black;
+	font-family: serif;
 }
 
 #specialform {
@@ -20,10 +21,6 @@ body {
 	font-size: 8pt;
 }
 
-#topbar {
-	padding: 0;
-}
-
 #powersearch {
 	background: #DDEEFF;
 	border-style: solid;
@@ -61,64 +58,20 @@ textarea {
 }
 
 #footer {
+	margin-right: 2%;
+	margin-top: 1em;
 	padding: 4px;
+	font-family: verdana, arial, sans-serif;
+	font-size: 10pt;
+	text-align: center;
 }
 
 #footer form {
 	display: inline;
 }
 
-#sitetitle {
-	font-family: Times, serif;
-	color: white;
-	font-weight: normal;
-	font-size: 32pt;
-	line-height: 32pt;
-}
-
-td.top {
-	background-color: #6688AA;
-	color: white;
-	margin-top: 4px;
-	margin-bottom: 4px;
-	padding-top: 0;
-	padding-bottom: 0;
-	text-transform: uppercase;
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 8pt;
-}
-
-td.top a {
-	font-family: Verdana, Arial, sans-serif;
-	background-color: #6688AA;
-	color: white;
-	text-decoration: none;
-	font-size: 10pt;
-}
-
-td#top-syslinks {
-	text-align: right;
-	vertical-align: bottom;
-}
-td.top-linkcollection {
-	text-align: right;
-}
-/**
- * Overrides text justification (user preference)
- * See bug 31990
- */
-td.top-linkcollection #catlinks {
-	text-align: right;
-}
-td.top-subheader {
-	vertical-align: top;
-}
-td.bottom {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 10pt;
-	padding: 0;
-	text-align: center;
-	vertical-align: bottom;
+#cb-ca-edit {
+	font-weight: bold;
 }
 
 #pagestats {
@@ -127,12 +80,7 @@ td.bottom {
 	font-size: 9pt;
 }
 
-#sitesub {
-	font-family: Verdana, Arial, sans-serif;
-	font-size: 9pt; font-weight: bold;
-	color: black;
-	padding-top: 0;
-}
+
 
 #quickbar {
 	font-family: Verdana, Arial, sans-serif;
@@ -149,7 +97,13 @@ td.bottom {
 	color: #446688;
 }
 
-#quickbar h6 {
+/* Hide, but keep accessible for screen-readers */
+#mw-navigation h2 {
+	position: absolute;
+	top: -9999px;
+}
+
+#quickbar h3 {
 	font-family: Verdana, Arial, sans-serif;
 	font-size: 10pt;
 	font-weight: bold;
@@ -166,6 +120,14 @@ td.bottom {
 	margin-top: 0;
 }
 
+#quickbar .portlet ul,
+#quickbar .portlet li {
+	list-style-type: none;
+	margin: 0;
+	padding: 0;
+	line-height: inherit;
+}
+
 h1 {
 	color: #666666;
 	font-family: Verdana, Arial, sans-serif;
@@ -177,12 +139,12 @@ h1 .editsection {
 	font-size: 55.6%;
 }
 
-h1.pagetitle {
+h1#firstHeading {
 	padding-bottom: 0;
 	margin-bottom: 0;
 }
 
-#article p.subtitle {
+#article p.subtitle, #article p.subpages, #article p.tagline {
 	color: #666666;
 	font-size: 11pt;
 	font-weight: bold;
@@ -212,7 +174,7 @@ a.stub, #quickbar a.stub {
 	text-decoration: none;
 }
 
-a.new, #quickbar a.new {
+a.new, #quickbar span.new a, #footer span.new a {
 	color: #CC2200;
 }
 
@@ -227,3 +189,82 @@ small {
 input.mw-searchInput {
 	width: 106px;
 }
+
+/* Directionality-specific styles */
+#quickbar { position: absolute; left: 4px; }
+#article { margin-left: 148px; margin-right: 4px; }
+#footer { margin-left: 152px; }
+
+
+#sitetitle, #sitesub, #toplinks, #linkcollection {
+	margin-top: 0; 
+	margin-bottom: 0; 
+}
+
+#sitetitle, #toplinks {
+	color: white;
+	text-transform: uppercase;
+	height: 32pt;
+}
+#sitetitle {
+	padding-left: 8px;
+	font-family: Times, serif;
+	font-weight: normal;
+	font-size: 32pt;
+	line-height: 32pt;
+	background-color: #6688AA;
+}
+#sitetitle a, #toplinks a {
+	color: white;
+	text-decoration: none; 
+}
+/* Bring #sitetitle to top. Otherwise #toplinks is overlaid over it, making the link unclickable. */
+#sitetitle a {
+	position: relative;
+	z-index: 10
+}
+
+#toplinks {
+	font-family: Verdana, Arial, sans-serif;
+	position: absolute;
+	top: 0;
+	right: 8px;
+	width: 100%;
+	font-size: 8pt;
+}
+#toplinks a {
+	font-size: 10pt;
+}
+#toplinks p {
+	position: absolute;
+	right: 0;
+	margin: 0;
+	width: 100%;
+	text-align: right;
+}
+#toplinks #syslinks {
+	bottom: 0;
+}
+#toplinks #variantlinks {
+	bottom: 12pt;
+}
+
+#sitesub {
+	float: left;
+	margin-left: 8px;
+	font-family: Verdana, Arial, sans-serif;
+	font-size: 9pt;
+	font-weight: bold;
+	color: black;
+}
+
+#linkcollection {
+	margin-top: 0.5em;
+	font-size: small;
+	margin-right: 8px;
+	text-align: right;
+}
+/* Override text justification (user preference), see bug 31990 */
+#linkcollection * {
+	text-align: right;
+}