Merge jdong

diff --git a/app/views/voter/_sortable_vote.rhtml b/app/views/voter/_sortable_vote.rhtml
index 79e95b52f548952d44a68a9d37d1dd1d8759e942..512a4ee7371c301ed615cf496d478e355db12e58 100644 (file)
--- a/app/views/voter/_sortable_vote.rhtml
+++ b/app/views/voter/_sortable_vote.rhtml
@@ -7,8 +7,8 @@
 </ol>
 </div>
 
-<div class="clearbox"></div>
+<div class="clear-div"></div>
 
 <%= sortable_element 'rankings-list',
     :url => { :action => "sort_candidates", :id => @voter.vote.id },
-    :complete => visual_effect(:highlight, 'rankings-list') %>
\ No newline at end of file
+    :complete => visual_effect(:highlight, 'rankings-list') %>

diff --git a/public/stylesheets/main.css b/public/stylesheets/main.css
index acdff30b59a552c68e5708f4536dc9ea246e937a..1d63f4c05241684ed46060d136832e0de5338ccd 100644 (file)
--- a/public/stylesheets/main.css
+++ b/public/stylesheets/main.css
@@ -25,6 +25,9 @@ h3 {
        margin: 0 0 1em 0 !important;
 }
 
+ol {
+  list-style-type: none;
+}
 .special {
        background-color: #999999;
        color: white;