Dev: Fix 19e594d

Dev: Can force global class with -1 or 1.1
LimeSurvey · Mar 22, 2013 · 0536ac5 · 0536ac5
1 parent d812629
commit 0536ac5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -947,7 +947,7 @@ function setupColumns($columns, $answer_count,$wrapperclass="",$itemclass="")
     {
         $column_style = 'ul';
     };
-    if(!is_null($column_style)) // Add a global class for all column, 1 column too.
+    if(!is_null($column_style) && $columns!=1) // Add a global class for all column.
     {
         $wrapperclass.= " colstyle-{$column_style}";
     }

diff --git a/templates/citronade/template.css b/templates/citronade/template.css
@@ -434,6 +434,7 @@ ul.subquestions-list .dynamic_remaining span{color:#999;}
   padding: 0;
   white-space: normal
   display:block;
+  width:100%;
 }
  .colstyle-ul li.answer-item
 ,.colstyle-ul.radio-list li.answer-item
@@ -474,7 +475,7 @@ ul.colstyle-css .answer-item
 ul.colstyle-css .radio
 ,ul.colstyle-css .checkbox
 {
-  float:left;
+  float:left;width:100%;
 }
 ul.colstyle-css label
 {

diff --git a/templates/default/template.css b/templates/default/template.css
@@ -900,6 +900,7 @@ ul.colstyle-css,table.colstyle-table
 ul.colstyle-css li,ul.colstyle-ul
 {
   float: left;
+  width: 100%;
   padding: 0;
   white-space: normal
 }