Bug 341495: Merge the banner and header

Patch by Byron Jones <bugzilla@glob.com.au> r=LpSolit,kevin.benton a=justdave

1 files changed, 42 insertions, 40 deletions

diff --git a/skins/standard/global.css b/skins/standard/global.css
index 65ff85a64..aa303fc7e 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -27,53 +27,55 @@ body
     background-color: #fff;
 }
 
-/* banner (begin) */
-    #banner
-    {
-        width: 100%;
-        background: #fff;
-        padding-bottom: 1em;
-    }
-
-    #banner p
+/* header (begin) */
+    #header
     {
-        margin: 0;
-        margin-bottom: 1px;
-        padding: 0;
+        margin-bottom: 1em;
+        padding-bottom: 2px;
     }
 
-    #banner-name
+    #header form
     {
-        font-size: 0px;
-        height: 48px;
-        background: transparent no-repeat url(global/header.png);
+        font-size: 85%;
+        display: inline;
     }
 
-    #banner .links
+    #header .links
     {
         font-family: sans-serif;
         font-size: 85%;
-        background: #fff;
+        border-left: 1px solid silver;
+        border-right: 1px solid silver;
+        border-bottom: 1px solid silver;
+        -moz-border-radius-bottomleft: 5px;
+        -moz-border-radius-bottomright: 5px;
+        padding: 0.5em;
     }
 
-    #banner form
+    #message
     {
-        font-size: 85%;
-        display: inline;
+        border: 1px solid red;
+
+        padding: 0.3em;
+        color: green;
     }
-/* banner (end) */
 
-/* header (begin) */
-    #header
+/* header (end)   */
+
+/* banner (begin) */
+    #banner
     {
-        width: 100%;
-        background-color: #edf2f2;
-        border: 1px solid #ddd;
-        margin-bottom: 1em;
     }
 
-    #header h1,h2,h3
+/* banner (end) */
+
+/* titles (begin) */
+    #titles
     {
+        width: 100%;
+        background-color: #404D6C;
+        color: #fff;
+        -moz-border-radius: 5px;
         font-family: sans-serif;
         font-size: 110%;
         margin: 0;
@@ -81,33 +83,33 @@ body
         vertical-align: bottom;
     }
 
-    #header h1
+    #titles a
+    {
+        color: #fff;
+    }
+
+    #titles #title
     {
         font-weight: bold;
+        white-space: nowrap;
     }
 
-    #header h2
+    #titles #subtitle
     {
         font-weight: normal;
         width: 100%;
         text-align: center;
     }
 
-    #header h3
+    #titles #information
     {
         font-weight: normal;
         text-align: right;
         font-size: 90%;
+        white-space: nowrap;
     }
 
-    #message
-    {
-        border: 1px solid red;
-
-        padding: 0.3em;
-        color: green;
-    }
-/* header (end)   */
+/* titles (end) */
 
 /* footer (begin) */
     #footer