From 6315239f1554ed511ccf6c94994835ebd2aec7b7 Mon Sep 17 00:00:00 2001 From: Anthony Phillips Date: Sun, 26 Feb 2012 15:36:39 -0800 Subject: [PATCH] moving things around, like the next button --- app/assets/stylesheets/questions.css.scss | 2 +- app/controllers/questions_controller.rb | 2 +- app/views/layouts/application.html.erb | 1 - app/views/questions/show.html.erb | 8 +++++--- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/assets/stylesheets/questions.css.scss b/app/assets/stylesheets/questions.css.scss index 145f65b..e413686 100644 --- a/app/assets/stylesheets/questions.css.scss +++ b/app/assets/stylesheets/questions.css.scss @@ -47,7 +47,7 @@ .option{ width:300px; - height:400px; + height:350px; float:left; padding-top:20px; } diff --git a/app/controllers/questions_controller.rb b/app/controllers/questions_controller.rb index ad2ac30..e806e74 100644 --- a/app/controllers/questions_controller.rb +++ b/app/controllers/questions_controller.rb @@ -6,7 +6,7 @@ def show @question = Question.find(1) params[:id] = 1 end - unless @question.id == 5 + unless @question.id == 4 @next_question = Question.find(params[:id].to_i + 1) else @next_question = @question diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 97b8d13..f22df4f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,7 +45,6 @@ - <%= params %>