Merge jdong

[selectricity] / public / stylesheets / main.css

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index ca71d76539e0de25d42cb1abc9c5f00e0885a1d9..13626a13bd67f4a807535390e38f603e9ef76c8c 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -1,4 +1,5 @@
 @charset "utf-8";
+
 /* CSS Document */
 
 /****************************************************************
@@ -24,6 +25,17 @@ h3 {
        margin: 0 0 1em 0 !important;
 }
 
+.special {
+       background-color: #999999;
+       color: white;
+       text-align: center;
+       pading: 0 1em 0 1em;
+}
+
+label {
+    font-weight: bold;
+}
+
 
 /* Left column. Includes logo, poll information, and graph. */
  
@@ -140,76 +152,96 @@ h5 {
        overflow: hidden;
 }
 
+#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 {
+    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 {
+    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;
-       width: 611px;
-       padding: 0;
+       width: 571px;
+       padding: 20px;
        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;
 }
 
-#ErrorExplanation h2 {
+#errorExplanation h2 {
+  font-size: 1em !important;
   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;
 }
 
-#ErrorExplanation p {
+#errorExplanation p {
+  font-size: 1em;
   color: #333;
   margin-bottom: 0;
   padding: 5px;
 }
 
-#ErrorExplanation ul li {
-  font-size: 12px;
+#errorExplanation ul li {
+  font-size: 1em;
   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;
@@ -220,81 +252,6 @@ h5 {
   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;
@@ -309,6 +266,35 @@ li.moveable {
   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;
@@ -415,20 +401,10 @@ li.moveable {
 }
 
 #election_creation_progress_bar ul li {
-  display: inline;
+  display: block;
   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: "";
-}
-
 #election_creation_progress_bar li.step_selected {
   font-weight: bold;
 }
@@ -438,36 +414,5 @@ li.moveable {
   font-weight: bold;
 }
 
-/*
-#plurality h4 {
-       background: url(/images/voting_plurality.png);
-       width: 217px;
-}
-
-#schulze h4 {
-       background: url(/images/voting_schulze_quickvote.png);
-       width: 183px;
-}
-
-#approval h4 {
-       background: url(/images/voting_approval.png);
-       width: 208px;
-}
-
-#borda h4 {
-       background: url(/images/voting_borda.png);
-       width: 147px;
-}
-
-#condorcet h4 {
-       background: url(/images/voting_condorcet.png);
-       width: 240px;
-}
-
-#irv h4 {
-       background: url(/images/voting_irv.png);
-       width: 86px;
-}
-*/