Merge

2014-03-18 21:30:12 +01:00 · 2014-03-18 21:30:12 +01:00 · 3af9bad30e
commit 3af9bad30e
parent 2ccd37a7af
92 changed files with 2089 additions and 10693 deletions
--- a/app/views/admin/questions/_form.html.haml
+++ b/app/views/admin/questions/_form.html.haml
@ -1,8 +1,8 @@
-.row-fluid
-  .span6
+.row
+  .col-md-6
    %legend Question
    = f.input :title, :label => "Your Question"
    = f.input :question_type
    = f.input :global, :label => "Make Global", :hint => "(Global questions are available for selection to all conferences)"
-  .span6
+  .col-md-6
    = dynamic_association :answers, "Answers", f, :hint => "Insert your answers in the order you want them to appear"