Merge branch 'master' of git://gitorious.org/~ruinar/selectricity/ruinar-selectricity

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

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index e7ff4a6587ec91b1854b689e5ccabf64676c3043..acb8bb294f85eb1d04449a76a84f71ce1b754a18 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -36,6 +36,11 @@ label {
     font-weight: bold;
 }
 
+pre {
+    font-family: monospace;
+    overflow: scroll;
+    background: #d9d9d9;
+}
 
 /* Left column. Includes logo, poll information, and graph. */
  
@@ -439,14 +444,9 @@ div.photo img {
 .candidate_box_info {
  margin: 0.5em 0 0.5em 3em;
 }
-/*.candidate_box_picture {
- width: 100px;
+.candidate_box_picture {
  float: left;
- margin: 0 0.8em 0.5em 0;
-}*/
-.candidate_box_picture img {
- width: 100px;
- border: 1px solid black;
+ margin: 0 0.8em 0.4em 0;
 }
 .candidate_box_description {
  display: inline;