From: <jlsharps@mit.edu>
Date: Mon, 30 Jun 2008 03:33:56 +0000 (-0400)
Subject: scrollbar appears if two many electons on control panel. ooks pretty nasty.
X-Git-Url: https://projects.mako.cc/source/selectricity/commitdiff_plain/07ff860387aed826ff4046f16a27324c58e4fb3d?ds=sidebyside

scrollbar appears if two many electons on control panel. ooks pretty nasty.
---

diff --git a/app/controllers/election_controller.rb b/app/controllers/election_controller.rb
index 68d59cc..7f87b2e 100644
--- a/app/controllers/election_controller.rb
+++ b/app/controllers/election_controller.rb
@@ -46,6 +46,7 @@ class ElectionController < ApplicationController
     @election.anonymous = 1
     @election.startdate = Time.now
     
+    
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}
       token_generator = UniqueTokenGenerator.new( 16 )
@@ -79,7 +80,6 @@ class ElectionController < ApplicationController
   def update_general_information
     @election = Election.find(params[:id])
     
-    
     holder = create_theme_hash
     unless holder.values.all? {|v| v.has_value?("")}
       unless @election.embed_custom_string
diff --git a/app/views/front/index.rhtml b/app/views/front/index.rhtml
index afdf35d..70cad25 100644
--- a/app/views/front/index.rhtml
+++ b/app/views/front/index.rhtml
@@ -19,7 +19,8 @@
 </div>
 
 <div id="control-room" class="main-section">
-  <div id="control-room-content">
+  <div id="control-room-content" >
+		
   <h2>Control Room</h2>
   <% if session[:user] %>
     <%= render :partial => 'user_summary' %> 
diff --git a/public/stylesheets/front.css b/public/stylesheets/front.css
index 4c973b1..8805abe 100644
--- a/public/stylesheets/front.css
+++ b/public/stylesheets/front.css
@@ -127,6 +127,7 @@ h3 {
 
 #control-room-content {
 	height: 428px;
+	overflow:auto;
 }
 
 #quickvotes {