# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1274577252 -7200
# Node ID 973d6794c880340287bc86bdce1de10b8a9cdd82
# Parent  74ebf308aa0f90ff71a90ad4b4b71924697225aa
Introduced styling for the entire header and footer, plus some general styling,
fixing the link highlighting policy.

diff -r 74ebf308aa0f -r 973d6794c880 themes/mercurialwiki/css/screen.css
--- a/themes/mercurialwiki/css/screen.css	Sat May 22 23:01:54 2010 +0200
+++ b/themes/mercurialwiki/css/screen.css	Sun May 23 03:14:12 2010 +0200
@@ -10,24 +10,41 @@
     padding: 0;
     margin: 0;
     border: 0;
+
+    /* Styling similar to the main site. */
+
+    font-family: Helvetica, Verdana, Arial, sans-serif;
+    color: #111;
+    margin: 0 5em;
 }
 
-a:link { color: #00b5f1; text-decoration: underline; }
-a:link:hover, a:link:active, a:link:focus { text-decoration: none; }
-a.nonexistent:link { color: #666; text-decoration: underline; }
-a.nonexistent:hover { text-decoration: none; }
+a:link, a:visited { color: #00b5f1; text-decoration: none; }
+a:link:hover, a:link:active, a:link:focus,
+a:visited:hover, a:visited:active, a:visited:focus { text-decoration: underline; }
+a.nonexistent:link { color: #666; text-decoration: none; }
+a.nonexistent:hover { text-decoration: underline; }
 
 a.download {
     font-size: 120%; 
     letter-spacing: 0.05em;
     font-weight: bold;
-    background: #E7E7E7;
     border: 1px solid #9C9C9C;
     padding: 0.5em;
     text-align: center;
+
+    /* Styling similar to the main site. */
+
+    font-family: Verdana, Arial, sans-serif;
+    background: #12baf2;
+    color: #fff;
 }
 
-input {
+input, select {
+
+    /* Styling similar to the main site. */
+
+    font-family: Helvetica, Arial, sans-serif;
+    font-size: 0.8571em;
 }
 
 textarea {
@@ -39,28 +56,37 @@
     color: gray;
 }
 
-/* Navigational controls. */
+.editbar li .disabled {
+    color: white;
+}
 
-#navibar {
-    float: left;
-    margin: 17px 0;
+/* Navigational and editing controls. */
+
+#navibar, .editbar {
+    float: right;
+    margin: 17px 0 0 0;
     padding: 0;
     background: #999;
 }
 
-#navibar li {
+#navibar li, .editbar li {
     display: inline;
     margin: 0;
     padding: 0;
 }
 
-#navibar a {
+.editbar form, .editbar form div {
+    display: inline;
+    margin: 0;
+}
+
+#navibar a, .editbar a {
 
     /* Need a block to redefine the height. */
 
     display: inline-block;
-    height: 3em;
-    line-height: 3em;
+    height: 42px;
+    line-height: 42px;
 
     color: #fff;
     margin: 0;
@@ -68,27 +94,31 @@
     text-decoration: none;
 }
 
-#navibar a:hover, #navibar a:focus, #navibar li.current a {
+#navibar a:hover, #navibar a:focus, #navibar li.current a,
+.editbar a:hover, .editbar a:focus, .editbar li.current a {
     background: #00b5f1;
+    text-decoration: none;
+}
+
+.editbar span {
+    padding: 0 16px;
 }
 
 /* Other elements. */
 
 #logo {
     float: left;
-    margin: 0.5em;
+    margin: 0;
     padding: 0;
+
     /* For text only logo */
+
     font-size: larger;
     font-weight: bold;
 }
 
-*[dir="rtl"] #logo {
-    float: right;
-}
-
 #logo img {
-    vertical-align: middle;
+    vertical-align: bottom;
 }
 
 #logo a {
@@ -97,40 +127,61 @@
 }
 
 #searchform {
-    margin: 4px 0.5em 8px 0.5em;
-    padding: 0;
-    font-size: 0.82em;
+
     float: right;
-    clear: right;
-    text-align: right;
-}
+
+    /* Margin and padding correspond to the navibar settings. */
 
-*[dir="rtl"] #searchform {
-    float: left;
-    clear: left;
-    text-align: left;
+    margin: 17px 0 0 0;
+    padding: 0 16px;
+    background: #999;
+
+    /* Height settings correspond to navibar list entries. */
+
+    height: 42px;
+    line-height: 42px;
 }
 
 #searchform input {
-    font-size: 100%;
     vertical-align: middle;
 }
 
-#pageline {
+.actionsmenu div {
+
+    /* Margin and padding correspond to the navibar settings. */
+    /* Set on the div to avoid accidental vertical expansion. */
+
+    padding-right: 16px;
+}
+
+#pageline, .pageline {
+
+    /* Prevent mixing of header and content elements. */
+
+    clear: both;
+    margin: 0;
+    padding: 0;
+    border-bottom: 1px solid #ccc;
+}
+
+#footer .pageline {
+    padding-top: 2px;
 }
 
 #message {
     clear: both;
     margin: 0;
     padding: 5px 10px;
-    border-bottom: 1px solid #c9c9c9;
-    background: #E6EAF0;
+
+    /* Styling similar to the advanced search. */
+
+    border-bottom: 1px solid #ADB9CC;
+    background-color: #E7E7E7;
 }
 
 #message p {
     margin: 5px 0;
     padding: 0;
-    /* font-weight: bold; */
 }
 
 #message div.buttons {
@@ -164,10 +215,6 @@
     background-color: white;
     margin: 0;
     padding: 0.25em;
-
-    /* Prevent mixing of header and content elements. */
-
-    clear: both;
 }
 
 #editor-textarea {
@@ -223,12 +270,14 @@
 input.button {
 }
 
-#credits, #version, #timings{
-    margin: 5px 10px;
-    padding: 0;
-    text-align: center;
-    font-size: 0.88em;
-    color: #6C7680;
+#credits, #version, #timings {
+    float: right;
+
+    /* Styling similar to the main site. */
+
+    font-family: Verdana, Helvetica, Arial, sans-serif;
+    font-size: .6428em;
+    padding: 10px 25px;
 }
 
 #credits li, #timings li {
@@ -241,6 +290,10 @@
     vertical-align: middle;
 }
 
+#credits a {
+    text-decoration: none;
+}
+
 .diff {
     width:99%;
 }
diff -r 74ebf308aa0f -r 973d6794c880 themes/mercurialwiki/mercurialwiki.py
--- a/themes/mercurialwiki/mercurialwiki.py	Sat May 22 23:01:54 2010 +0200
+++ b/themes/mercurialwiki/mercurialwiki.py	Sun May 23 03:14:12 2010 +0200
@@ -108,9 +108,14 @@
         html.append(fmt.div(on=1, attr={"id" : "header"}))
 
         html.append(self.logo())
+        html.append(self.searchform(d))
         html.append(self.navibar(d))
-        html.append(self.searchform(d))
+
+        html.append(fmt.div(on=0))
 
+        # A separator.
+
+        html.append(fmt.div(on=1, attr={"class" : "pageline"}))
         html.append(fmt.div(on=0))
 
         # Show any pertinent message.
@@ -160,6 +165,12 @@
 
         if self.shouldShowEditbar(page):
             html.append(self.editbar(d))
+
+        # A separator.
+
+        html.append(fmt.div(on=1, attr={"class" : "pageline"}))
+        html.append(fmt.div(on=0))
+
         html.append(self.credits(d))
 
         #html.append(self.trail(d))