merged in changes from devel branch

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

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index 418e892534c4e06780c5d080b37331e0a06efbfb..e7ff4a6587ec91b1854b689e5ccabf64676c3043 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -71,15 +71,9 @@ label {
        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. */
 


@@ -153,15 +147,14 @@ h5 {
 }
 
 #title-header {
 }
 
 #title-header {

-    margin: -20px -20px 1em -20px;
-    height: 32px;
-    margin-bottom: 14px;
+    margin: -20px -20px 14px -20px;
+    height: 34px;

        background-color: #e5e5e5;
 }
 
 .normal-header {
     margin: 1.3em -20px 1.3em -20px;
        background-color: #e5e5e5;
 }
 
 .normal-header {
     margin: 1.3em -20px 1.3em -20px;

-    height: 32px;
+    height: 34px;

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


@@ -173,7 +166,7 @@ h5 {
     text-align: center;
     color: white;
     background-color: #999999;
     text-align: center;
     color: white;
     background-color: #999999;

-    height: 32px;
+    height: 34px;

     float: left;
     padding: 0px .75em 0px .75em;
 }
     float: left;
     padding: 0px .75em 0px .75em;
 }


@@ -184,8 +177,9 @@ h5 {
     font-size: 18px;
     color: #666666;
        background-color: #e5e5e5;
     font-size: 18px;
     color: #666666;
        background-color: #e5e5e5;

-    height: 26px;
-    padding: 6px 1em 0px 10px;
+    /* height: 26px; */
+    padding: 6px 0px 0px 10px;
+    margin-bottom: 14px;

 } 
 
 #main-box {
 } 
 
 #main-box {


@@ -252,52 +246,9 @@ blockquote {
   background-color: #f0f0f0;
 }
 
   background-color: #f0f0f0;
 }
 

-li.moveable {
-  background-color: #E5FFCC;
-  border:1px solid #4D801A;
-  cursor: move;
-  padding: 4px;
-  margin: 4px;
-}
-
-#sortable_list {
-  font-size: 24pt;
-  display: float;
-  float: left;
-}
-
-.preftable {
-       font-family: verdana,arial,helvetica,sans-serif;
-       border-spacing: 0px;
-       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 {
-       font-family: verdana,arial,helvetica,sans-serif;
-       border-width: 2px;
-       border-color: #999999;
-       border-style: solid;
-       text-align: center;
-       font-weight: bold;
-       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;
+.result_table {
+ text-align: center;
+ margin-bottom: 1em;

 }
 
 .voterbox {
 }
 
 .voterbox {


@@ -447,3 +398,56 @@ div.photo img {
  border: 1px black solid;
 }
 
  border: 1px black solid;
 }
 

+.winner_text {
+ text-align: center;
+}
+
+#winner_box {
+ border: 3px white solid;
+ background-color: #666666;
+ color: white; 
+ margin: 0.5em 0 1em 0;
+}
+
+.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 {
+ width: 100px;
+ float: left;
+ margin: 0 0.8em 0.5em 0;
+}*/
+.candidate_box_picture img {
+ width: 100px;
+ border: 1px solid black;
+}
+.candidate_box_description {
+ display: inline;
+}