Merge jdong

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

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 313dee5a55c6d5f658e9be66c3542c15c74e1f8a..13626a13bd67f4a807535390e38f603e9ef76c8c 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -152,52 +152,51 @@ h5 {
        overflow: hidden;
 }
 
        overflow: hidden;
 }
 

-.plain-header {
-    margin: 1em -1.2em 1em -1.2em;
+#title-header {
+    margin: -20px -20px 1em -20px;
+    height: 32px;
+    margin-bottom: 14px;
+       background-color: #e5e5e5;
+}
+
+.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;

-       width: 611px;
-       padding: 0;
+       width: 571px;
+       padding: 20px;

        background: #f9f9f9;
        border: 1px solid #b3b3b3;
 }
 
        background: #f9f9f9;
        border: 1px solid #b3b3b3;
 }
 

-.main-content {
-       margin: 1.2em;
-       line-height: 1.5em;
-       text-color: #454545;
-}
-
-.main-content p, .main-content blockquote, .main-content ul {
+#main-box p, #main-box blockquote, #main-box ul {

     margin-bottom: 1em;
 }
 
     margin-bottom: 1em;
 }
 


@@ -267,6 +266,35 @@ li.moveable {
   float: left;
 }
 
   float: left;
 }
 

+.preftable {
+       border-spacing: 0px;
+         border-width: 2px;
+         border-color: #999999;
+         border-style: solid;
+}
+
+.preftable th {
+       border-width: 2px;
+       border-color: #999999;
+       border-style: solid;
+       text-align: center;
+       font-weight: bold;
+       padding: 5px 5px 5px 15px;
+       background-color: #999999;
+       color: #fff;
+}
+
+.preftable td {
+  border-collapse: collapse;
+  border-width: 1px;
+  border-color: #999999;
+  border-style: solid;
+
+  text-align: right;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+

 .voterbox {
   border-spacing: 0px;
   border-width: 2px;
 .voterbox {
   border-spacing: 0px;
   border-width: 2px;