merge everything back from mainline branch

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

diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 01cd7c052e53363d8dffd1468d9fbc4511deb55a..5d7f199ae6943c7dcfdc523551ee6951172556aa 100644 (file)
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -29,7 +29,7 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 }
 
 body {
 }
 
 body {

-       font-size: 11px;
+       font-size: 0.9em;

        font-family: Trebuchet, Verdana, Arial, Helvetica, sans-serif;
 }
 
        font-family: Trebuchet, Verdana, Arial, Helvetica, sans-serif;
 }
 


@@ -76,7 +76,7 @@ h2, h3 {
 
 #footer {
        font-size: 11px;
 
 #footer {
        font-size: 11px;

-       font-family: Verdana, Arial, Helvetica, sans-serif;
+       font-family: "Trebuchet MS", Trebuchet, Verdana, Arial, sans-serif;

        margin-top: 40px;
        text-align: center;
 }
        margin-top: 40px;
        text-align: center;
 }


@@ -103,8 +103,38 @@ h2, h3 {
 #notice {
     background: #FFFBB3; 
     border: 1px black solid;
 #notice {
     background: #FFFBB3; 
     border: 1px black solid;

+       text-align: center;
+       font-weight: bold
+}
+
+.preftable {
+       font-family: verdana,arial,helvetica,sans-serif;
+       border-spacing: 0px;
+       border-width: 2px;
+       border-color: #999999;
+       border-style: solid;
+       caption-side: top;
+}
+
+.preftable th {
+       font-family: verdana,arial,helvetica,sans-serif;
+       border-width: 2px;
+       border-color: #999999;
+       border-style: solid;

        text-align: center;
        font-weight: bold;
        text-align: center;
        font-weight: bold;

-       padding: 5px 5px 5px 15px;
-    width: 250px;
+       padding: 5px 5px 5px 5px;
+       background-color: #999999;
+       color: #FFFFFF;

 }
 }

+
+.preftable td {
+  border-collapse: collapse;
+  border-width: 1px;
+  border-color: #999999;
+  border-style: solid;
+  text-align: right;
+  padding-right: 5px;
+  padding-left: 5px;
+}
+