merged in changes from devel

[selectricity] / public / stylesheets / main.css

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index acdff30b59a552c68e5708f4536dc9ea246e937a..418e892534c4e06780c5d080b37331e0a06efbfb 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -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;


@@ -266,21 +267,27 @@ li.moveable {
 }
 
 .preftable {
 }
 
 .preftable {

+       font-family: verdana,arial,helvetica,sans-serif;

        border-spacing: 0px;
        border-spacing: 0px;

-         border-width: 2px;
-         border-color: #999999;
-         border-style: solid;
+       border-width: 2px;
+       border-color: #999999;
+       border-style: solid;
+       caption-side: top;
+}
+.preftable caption { 
+  font-family: verdana,arial,helvetica,sans-serif;
+  font-size: 0.9em;

 }
 }

-

 .preftable th {
 .preftable th {

+       font-family: verdana,arial,helvetica,sans-serif;

        border-width: 2px;
        border-color: #999999;
        border-style: solid;
        text-align: center;
        font-weight: bold;
        border-width: 2px;
        border-color: #999999;
        border-style: solid;
        text-align: center;
        font-weight: bold;

-       padding: 5px 5px 5px 15px;
+       padding: 5px 5px 5px 5px;

        background-color: #999999;
        background-color: #999999;

-       color: #fff;
+       color: #FFFFFF;

 }
 
 .preftable td {
 }
 
 .preftable td {


@@ -288,7 +295,6 @@ li.moveable {
   border-width: 1px;
   border-color: #999999;
   border-style: solid;
   border-width: 1px;
   border-color: #999999;
   border-style: solid;

-

   text-align: right;
   padding-right: 5px;
   padding-left: 5px;
   text-align: right;
   padding-right: 5px;
   padding-left: 5px;


@@ -323,6 +329,16 @@ li.moveable {
   padding-left: 5px;
 }
 
   padding-left: 5px;
 }
 

+/* voterbox#election is used on user summary page */
+.voterbox#election { border-color: #990d13; }
+
+.voterbox#election th {
+        background-color: #dc0d13;
+        border-color: #dc0d13; 
+}
+       
+.voterbox#election td { border-color: #990d13;}
+

 .rbmoreinfo hr {
   width: 100%;
   height: 10px;
 .rbmoreinfo hr {
   width: 100%;
   height: 10px;


@@ -346,7 +362,7 @@ li.moveable {
   width: 400px;
   border-width: 2px;
   border-style: solid;
   width: 400px;
   border-width: 2px;
   border-style: solid;

-  border-color: #73BF26;
+  border-color: #999999;

   padding: 7px;
   padding-bottom: 12px;
   margin-bottom: 20px;
   padding: 7px;
   padding-bottom: 12px;
   margin-bottom: 20px;


@@ -359,7 +375,7 @@ li.moveable {
   padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;
   padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;

-  background-color: #73BF26;
+  background-color: #999999;

   color: #fff;
   border-bottom: 0px;
 }
   color: #fff;
   border-bottom: 0px;
 }


@@ -374,7 +390,7 @@ li.moveable {
   width: 400px;
   border-width: 2px;
   border-style: solid;
   width: 400px;
   border-width: 2px;
   border-style: solid;

-  border-color: #4D801A;
+  border-color: #dc0d13;

   padding: 7px;
   padding-bottom: 12px;
   margin-bottom: 20px;
   padding: 7px;
   padding-bottom: 12px;
   margin-bottom: 20px;


@@ -389,7 +405,7 @@ li.moveable {
   padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;
   padding: 5px 5px 5px 15px;
   font-size: 12px;
   margin: -7px;

-  background-color: #4D801A;
+  background-color: #dc0d13;

   color: #fff;
   border-bottom: 0px;
 }
   color: #fff;
   border-bottom: 0px;
 }


@@ -399,19 +415,35 @@ li.moveable {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

-#election_creation_progress_bar ul li {
+#progress_bar ul li {

   display: block;
   list-style: default;
 }
 
   display: block;
   list-style: default;
 }
 

-#election_creation_progress_bar li.step_selected {
+#progress_bar li.step_selected {
+  font-weight: bold;
+}
+
+#progress_bar li.step_unselected {
+  color: #CCCCCC;

   font-weight: bold;
 }
 
   font-weight: bold;
 }
 

-#election_creation_progress_bar li.step_unselected {
+#progress_bar li.step_unselected {

   color: #CCCCCC;
   font-weight: bold;
 }
 
   color: #CCCCCC;
   font-weight: bold;
 }
 

+#progress_bar li.step_unselected a {
+  text-decoration: none;
+}

 
 

+div.photo {
+ text-align: center;
+ margin-bottom: 1.5em;
+}
+
+div.photo img {
+ border: 1px black solid;
+}