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 50863c1cadb807adf2adee481dc5e41327182068..e7ff4a6587ec91b1854b689e5ccabf64676c3043 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -246,54 +246,10 @@ 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;
-}
-

 .result_table {
  text-align: center;
  margin-bottom: 1em;
 }
 .result_table {
  text-align: center;
  margin-bottom: 1em;
 }

-.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;
-       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;
-}

 
 .voterbox {
   border-spacing: 0px;
 
 .voterbox {
   border-spacing: 0px;


@@ -464,3 +420,34 @@ div.photo img {
  margin: 0;
  padding: 0;
 }
  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;
+}