two minor changes that fix bugs with the quickvote

[selectricity] / public / stylesheets / main.css

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 185b48ab96a0aefb19d092367ccf625730b3636c..acb8bb294f85eb1d04449a76a84f71ce1b754a18 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -1,4 +1,5 @@
 @charset "utf-8";
 @charset "utf-8";

+

 /* CSS Document */
 
 /****************************************************************
 /* CSS Document */
 
 /****************************************************************


@@ -31,6 +32,15 @@ h3 {
        pading: 0 1em 0 1em;
 }
 
        pading: 0 1em 0 1em;
 }
 

+label {
+    font-weight: bold;
+}
+
+pre {
+    font-family: monospace;
+    overflow: scroll;
+    background: #d9d9d9;
+}

 
 /* Left column. Includes logo, poll information, and graph. */
  
 
 /* Left column. Includes logo, poll information, and graph. */
  


@@ -66,15 +76,9 @@ h3 {
        color: #666666;
 }
 
        color: #666666;
 }
 

-/* #graph {
-       margin-top: 50px;
-       background: url(/images/graph.jpg) top left no-repeat;
-       height: 0px;
-       overflow: hidden;
-       padding-top: 243px;
-} */
-
-
+.graph {
+  text-align: center;
+}

 
 /* Right column. Includes top-bar and main-box. */
 
 
 /* Right column. Includes top-bar and main-box. */
 


@@ -147,128 +151,96 @@ h5 {
        overflow: hidden;
 }
 
        overflow: hidden;
 }
 

-#quickvote-title .header {
-       background-color: #74ce00;
-}
-
-#quickvote-title .subheader {
-       color: #74ce00;
-       background-color: #e5e5e5;
-}
-
-#controlroom-title .header {
-       background-color: #dc0d13;
-}
-
-#controlroom-title .subheader {
-       color: #dc0d13;
+#title-header {
+    margin: -20px -20px 14px -20px;
+    height: 34px;

        background-color: #e5e5e5;
 }
 
        background-color: #e5e5e5;
 }
 

-#voters-title .header {
-       background-color: #005cd9;
-}
-
-#voters-title .subheader {
-       color: #005cd9;
+.normal-header {
+    margin: 1.3em -20px 1.3em -20px;
+    height: 34px;

        background-color: #e5e5e5;
 }
 
 .header {
        background-color: #e5e5e5;
 }
 
 .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: 34px;
+    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 0px 0px 10px;
+    margin-bottom: 14px;
+} 

 
 #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-box h1 {
-  
+#main-box p, #main-box blockquote, #main-box ul {
+    margin-bottom: 1em;

 }
 
 }
 

-#main-box p {
-       margin-bottom: 1.75em;
-       padding: 0 1.7em 0 1.7em;
-       line-height: 1.8em;
-       color: #454545;
+blockquote {
+    margin-left: 3em;

 }
 
 
 }
 
 

-#ErrorExplanation {
-  width: 400px;
-  border: 2px solid 'red';
-  padding: 7px;
-  padding-bottom: 12px;
+/* css related to error in forms */
+
+#errorExplanation {
+  border: 2px solid #C00;
+  width: 260px;

   margin-bottom: 20px;
   background-color: #f0f0f0;
 }
 
   margin-bottom: 20px;
   background-color: #f0f0f0;
 }
 

-#ErrorExplanation h2 {
+#errorExplanation h2 {
+  font-size: 1em !important;

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

-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
+  padding: 5px 5px 5px 5px;

   background-color: #c00;
   color: #fff;
 }
 
   background-color: #c00;
   color: #fff;
 }
 

-#ErrorExplanation p {
+#errorExplanation p {
+  font-size: 1em;

   color: #333;
   margin-bottom: 0;
   padding: 5px;
 }
 
   color: #333;
   margin-bottom: 0;
   padding: 5px;
 }
 

-#ErrorExplanation ul li {
-  font-size: 12px;
+#errorExplanation ul li {
+  font-size: 1em;

   list-style: square;
 }
 
   list-style: square;
 }
 

-.ListLine0 {
-       background:  #e0f8f8;
-       
+.fieldWithErrors {
+    display: inline;

 }
 }

-.ListLine1 {
-       background: #cccccc;
-       
+.fieldWithErrors input, .fieldWithErrors select, .fieldWithErrors textarea {
+    background-color: #FFFBB3; 

 }
 
 }
 

-#notice { background: #FFFBB3; 
-                       text-align: left;
-                       font-weight: bold;
-                       border: 2px dotted 'red';
-                       margin-top: 10px;
-                       margin-left: 50px;
-                       padding: 5px 5px 5px 15px;
-                       width: 400px; }
-

 #status {
   width: 400px;
   border: 1px solid #0000FF;
 #status {
   width: 400px;
   border: 1px solid #0000FF;


@@ -279,93 +251,9 @@ h5 {
   background-color: #f0f0f0;
 }
 
   background-color: #f0f0f0;
 }
 

-.fieldWithErrors {
-    display: inline;
-}
-.fieldWithErrors input, .fieldWithErrors select {
-    background-color: #ffdfdf;
-}
-
-#xxErrorExplanation h2 {
-  text-align: left;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  font-size: 12px;
-  margin: -7px;
-  background-color: #c00;
-  color: #fff;
-}
-
-#xxErrorExplanation p {
-  color: #333;
-  margin-bottom: 0;
-  padding: 5px;
-}
-
-#xxErrorExplanation ul li {
-  font-size: 12px;
-  list-style: square;
-}
-
-.mainresultbox {
-  text-align: center;
-  width: 850px;
-  border-width: 2px;
-  border-style: solid;
-  border-color: #4D801A;
-  padding: 7px;
-  margin-right: 30px;
-  margin-bottom: 30px;
-}
-
-.mainresultbox h3 {
-  text-align: center;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  margin: -7px;
-  background-color: #73BF26;
-  color: #fff;
-  border-bottom: 0px;
-}
-
-.resultbox {
-  text-align: center;
-  width: 400px;
-  float: left;
-  border-width: 2px;
-  border-style: solid;
-  border-color: #4D801A;
-  padding: 7px;
-  margin-right: 30px;
-  margin-bottom: 30px;
-}
-
-.resultbox h3 {
-  text-align: center;
-  font-weight: bold;
-  padding: 5px 5px 5px 15px;
-  margin: -7px;
-  background-color: #73BF26;
-  color: #fff;
-  border-bottom: 0px;
-}
-.clearbox {
-   clear: both;
-   margin: 30px;
-}
-
-li.moveable {
-  background-color: #E5FFCC;
-  border:1px solid #4D801A;
-  cursor: move;
-  padding: 4px;
-  margin: 4px;
-}
-
-#sortable_list {
-  font-size: 24pt;
-  display: float;
-  float: left;
+.result_table {
+ text-align: center;
+ margin-bottom: 1em;

 }
 
 .voterbox {
 }
 
 .voterbox {


@@ -397,6 +285,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;


@@ -420,7 +318,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;


@@ -433,7 +331,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;
 }


@@ -448,7 +346,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;


@@ -463,7 +361,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;
 }


@@ -473,60 +371,83 @@ li.moveable {
   padding: 5px;
 }
 
   padding: 5px;
 }
 

-#election_creation_progress_bar ul li {
-  display: inline;
+#progress_bar ul li {
+  display: block;

   list-style: default;
 }
 
   list-style: default;
 }
 

-#election_creation_progress_bar ul li:after {
-  font-weight: normal;
-  color: #000;
-  content: " || ";
-}
-
-#election_creation_progress_bar ul li.last:after {
-  content: "";
+#progress_bar li.step_selected {
+  font-weight: bold;

 }
 
 }
 

-#election_creation_progress_bar li.step_selected {
+#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;
 }
 

-/*
-#plurality h4 {
-       background: url(/images/voting_plurality.png);
-       width: 217px;
+#progress_bar li.step_unselected a {
+  text-decoration: none;

 }
 
 }
 

-#schulze h4 {
-       background: url(/images/voting_schulze_quickvote.png);
-       width: 183px;
+div.photo {
+ text-align: center;
+ margin-bottom: 1.5em;

 }
 
 }
 

-#approval h4 {
-       background: url(/images/voting_approval.png);
-       width: 208px;
+div.photo img {
+ border: 1px black solid;

 }
 
 }
 

-#borda h4 {
-       background: url(/images/voting_borda.png);
-       width: 147px;
+.winner_text {
+ text-align: center;

 }
 
 }
 

-#condorcet h4 {
-       background: url(/images/voting_condorcet.png);
-       width: 240px;
+#winner_box {
+ border: 3px white solid;
+ background-color: #666666;
+ color: white; 
+ margin: 0.5em 0 1em 0;

 }
 
 }
 

-#irv h4 {
-       background: url(/images/voting_irv.png);
-       width: 86px;
+.winner_text {
+ font-size: 1.2em;
+}
+#winner_box .winner_text {
+ font-size: 2em;

 }
 }

-*/

 
 

+#winner_box p {
+ margin: 0;
+ padding: 0;
+}

 
 

+/* main election candidate stylesheet information */
+
+.candidate_box {
+}
+.candidate_box_name {
+ float: left;
+ font-size: 1.3em;
+ font-weight: bold;
+}
+.candidate_box_menu {
+ text-align: right;
+ float: right;
+ font-size: 0.8em;
+ font-weight: bold;
+}
+.candidate_box_info {
+ margin: 0.5em 0 0.5em 3em;
+}
+.candidate_box_picture {
+ float: left;
+ margin: 0 0.8em 0.4em 0;
+}
+.candidate_box_description {
+ display: inline;
+}