Dev: checkbox with comment + add some margin for radio/checkbox list

LimeSurvey · Oct 29, 2018 · 5d100fd · 5d100fd
1 parent 3c7fe1a
commit 5d100fd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -16,5 +16,5 @@
 $config['dbversionnumber'] = 355;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
-$config['assetsversionnumber'] = '30062';
+$config['assetsversionnumber'] = '30063';
 return $config;
diff --git a/application/views/survey/questions/answer/multiplechoice_with_comments/answer.twig b/application/views/survey/questions/answer/multiplechoice_with_comments/answer.twig
@@ -12,7 +12,7 @@
 
 <!-- answer -->
 <input type='hidden' name='{{ name }}' value='{{ value }}' />
-<ul class="{{ coreClass }} list-unstyled" role="group" aria-labelledby="ls-question-text-{{ basename }}">
+<ul class="{{ coreClass }} list-unstyled form-horizontal" role="group" aria-labelledby="ls-question-text-{{ basename }}">
         {# rows/answer_row.php #}
          {{ sRows }}
 </ul>

diff --git a/application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row.twig b/application/views/survey/questions/answer/multiplechoice_with_comments/rows/answer_row.twig
@@ -24,10 +24,10 @@
  */
 #}
 <!-- answer_row -->
-<li id="javatbd{{ name }}" class='row checkbox-text-item form-inline'>
+<li id="javatbd{{ name }}" class='row checkbox-text-item form-group' role='group'>
     <!-- Checkbox + label -->
     <div class="col-sm-{{ sLabelWidth }} col-xs-12">
-        <div class="checkbox-item answer-item form-group">
+        <div class="checkbox-item answer-item">
             <input
                 class="{{ classes }} {{ kpclass }}"
                 title="{{ title }}"
@@ -49,7 +49,7 @@
     </div>
 
     <!-- Comment -->
-    <div class="col-sm-{{ sInputContainerWidth }} col-xs-12 answer-item text-item comment-item form-group">
+    <div class="col-sm-{{ sInputContainerWidth }} col-xs-12 answer-item text-item comment-item">
             <input
                 class='form-control {{ kpclass }}'
                 type='text'

diff --git a/assets/packages/template-core/template-core.css b/assets/packages/template-core/template-core.css
@@ -19,7 +19,8 @@ li.question-item.answer-item.text-item.form-group{
 [data-number='1']{text-align:right}
 .dir-rtl [data-number='1']{text-align:left}
 .slider-list .ls-group-dynamic [data-number='1']{text-align:center}
-
+/* no form-group on radio-item and checkbox-item */
+li.radio-item,li.checkbox-item{margin-bottom:1em}
 /* awesome-bootstrap-checkbox */
 li.radio-item,li.checkbox-item{display:block}
 /* map item : .input-group-addon.checkbox-item : put awesome padding */