Merge from jdong

[selectricity-live] / public / stylesheets / main.css

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 1bed0b589e6424d5a42837b824358edce283aa9b..13626a13bd67f4a807535390e38f603e9ef76c8c 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -12,7 +12,7 @@
 body {
        color: black;
        background: white;
 body {
        color: black;
        background: white;

-       background: url(/images/bg_main.gif) repeat-x top left;
+       background: url(/images/bg_main.png) repeat-x top left;

 }
 
 h2 {
 }
 
 h2 {


@@ -51,7 +51,7 @@ label {
        height: 0px;
        overflow: hidden;
        padding-top: 189px;
        height: 0px;
        overflow: hidden;
        padding-top: 189px;

-       background: url(/images/title_main.gif) no-repeat top left;
+       background: url(/images/title_main.png) no-repeat top left;

 }
 
 
 }
 
 


@@ -103,7 +103,7 @@ label {
 }
 
 div#bar-left {
 }
 
 div#bar-left {

-       background-image: url(/images/top_bar_1.gif);
+       background-image: url(/images/top_bar_1.png);

        width: 153px;
        height: 37px;
        padding-top: 8px;
        width: 153px;
        height: 37px;
        padding-top: 8px;


@@ -112,7 +112,7 @@ div#bar-left {
 }
 
 div#bar-right {
 }
 
 div#bar-right {

-       background-image: url(/images/top_bar_2.gif);
+       background-image: url(/images/top_bar_2.png);

        width: 78px;
        height: 37px;
        padding-top: 8px;
        width: 78px;
        height: 37px;
        padding-top: 8px;


@@ -152,40 +152,41 @@ h5 {
        overflow: hidden;
 }
 
        overflow: hidden;
 }
 

-#page-title {
+#title-header {

     margin: -20px -20px 1em -20px;
     margin: -20px -20px 1em -20px;

+    height: 32px;
+    margin-bottom: 14px;
+       background-color: #e5e5e5;

 }
 
 }
 

-.plain-header {
-    margin: 1em -20px 1em -20px;
+.normal-header {
+    margin: 1.3em -20px 1.3em -20px;
+    height: 32px;
+       background-color: #e5e5e5;

 }
 
 .header {
 }
 
 .header {

-       display: block;
-       font-family: "trebuchet ms",trebuchet,verdana,arial,sans-serif;
-       font-size: 30px;
-       text-transform: uppercase;
-       text-align: center;
-       color: white;
-       background-color: #999999;
-       height: 32px;
-       float: left;
-       padding: 0px .75em 0px .75em;
-       margin-right: 10px;
-       margin-bottom: 14px;
+    display: block;
+    font-family: verdana,arial,helvetica,sans-serif;
+    font-size: 30px;
+    text-transform: uppercase;
+    text-align: center;
+    color: white;
+    background-color: #999999;
+    height: 32px;
+    float: left;
+    padding: 0px .75em 0px .75em;

 }
 
 .subheader {
 }
 
 .subheader {

-       display: block;
-       font-family: "trebuchet ms",trebuchet,verdana,arial,sans-serif;
-       font-size: 18px;
-       text-align: left;
-       color: #666666;
-       background-color: #CCCCCC;
-       height: 26px;
-       padding: 6px 1em 0px 20px;
-       margin-bottom: 14px;
-}
+    float: left;
+    font-family: verdana,arial,helvetica,sans-serif;
+    font-size: 18px;
+    color: #666666;
+       background-color: #e5e5e5;
+    height: 26px;
+    padding: 6px 1em 0px 10px;
+} 

 
 #main-box {
        float: right;
 
 #main-box {
        float: right;