Shuffle the layout around a bit again.

[matthijs/projects/wipi.git] / static / exodus / css / screen.css

diff --git a/static/exodus/css/screen.css b/static/exodus/css/screen.css
index 58a820f763157b03807c1145ec4bc82c7486ba03..d4bb72692ef9800a342762bcc0d32f1a1c4c2f04 100644 (file)
--- a/static/exodus/css/screen.css
+++ b/static/exodus/css/screen.css
@@ -36,7 +36,7 @@ body {
 #header {
        /* Fit exactly into the header in the background, and push the menu bar in place */
        padding-top: 70px;
-       height: 30px;
+       height: 40px;
        /* Center the header */
        width:1024px;
        margin:auto;
@@ -71,6 +71,15 @@ ul#menubar li a {
        text-decoration:none;
 }
 
+#page, #footer{
+       /* Center the page and footer, just like the header */
+       width:1024px;
+       margin-right: auto;
+       margin-left: auto;
+}
+
+h1 { margin: 0; padding: 0; }
+
 #footer {
        /* Put a dotted line at the top of the footer */
        border-top: 1px dotted #9C9C9C;
@@ -79,32 +88,10 @@ ul#menubar li a {
        margin-top: 5px;
 }
 
-/* Format the editbar, copied from modern theme */
-
-.editbar {
-    float: left;
-    margin: 5px 0;
-    padding: 0;
-}
-
-.editbar a, .editbar a:visited { color: #0044B3; }
-
-.editbar form, .editbar form div {
-    display: inline;
-    margin: 0;
-}
-
-.editbar li {
-    display: inline;
-    padding: 0;
-    margin: 4px 6px;
-}
 
 #footerbar {
 }
 
-.editbar a, .editbar a:visited { color: #0044B3; }
-
 #editor {
     margin: 0;
     padding: 2px 20px 20px 20px;
@@ -120,45 +107,61 @@ ul#menubar li a {
     margin-top: 0.5em;
 }
 
+/* Format the pageinfo bar. */
+#pageinfo {
+    float: right;
+    margin: 0px 12px;
+}
 /* Format the username bar, copied from the modern theme */
 
 #username {
-    float: right;
+    float: left;
     display: inline;
-    margin: 5px 12px;
+    margin: 0px 12px;
     padding: 0;
     text-align: right;
     font-size: 0.82em;
     white-space: nowrap;
 }
 
-*[dir="rtl"] #username {
-    text-align: left;
-    margin: 5px 0px;
-}
-
 #username li {
     display: inline;
     padding: 0 0.5em 0 0;
 }
 
-#username form {
-    display: inline;
+#searchform {
+    /* Put the searchform below the pageinfo / username bar */
+    clear: both;
+    float: right;
+    /* Put a bit of offset between the pageinfo and searchform. Don't use
+     * margin here, that collapses with the floating pageinfo. */
+    padding-top: 10px;
 }
 
-#username input {
+.editbar {
+    /* Put a bit of offset between the pageinfo and searchform. Don't use
+     * margin here, that collapses with the floating pageinfo. */
+    /*padding-top: 10px;
+    margin: 5px 0;*/
+    /* Unset the default ul margins */
+    margin-top: 0px;
+    margin-bottom: 0px;
+    /* Put the editbar at the right side (but not over the image there */
+    float: right;
+    margin-right: 220px;
+    /* Prevent weird linebreaks */
+    white-space: nowrap;
+}
+
+.editbar form, .editbar form div {
     display: inline;
-    padding: 0;
     margin: 0;
-    border: none;
-    background: #E7E7E7; /* inherit doesnt work on IE */
-    color: blue;
-    font-size: 0.82em;
-    cursor: pointer;
 }
 
-#username input:hover {
-    color: red;
+.editbar li {
+    display: inline;
+    padding: 0;
+    margin: 4px 6px;
 }
 
 /****************** Next pages ************************/