From 059084c2a70d4ea0ad22507c73e6b9da5910c1d8 Mon Sep 17 00:00:00 2001
From: Olle Haerstedt <olle.haerstedt@limesurvey.org>
Date: Wed, 20 Apr 2016 16:57:17 +0200
Subject: [PATCH] Fixed issue #10993: Alignment of radio buttons

---
 .../questions/listradio/rows/answer_row.php   |  2 +-
 .../listradio/rows/answer_row_noanswer.php    |  2 +-
 .../listradio/rows/answer_row_other.php       |  6 ++---
 templates/default/css/template.css            | 25 ++++++++++++-------
 4 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/application/views/survey/questions/listradio/rows/answer_row.php b/application/views/survey/questions/listradio/rows/answer_row.php
index 4cfe8ded972..24c10979458 100644
--- a/application/views/survey/questions/listradio/rows/answer_row.php
+++ b/application/views/survey/questions/listradio/rows/answer_row.php
@@ -11,7 +11,7 @@
 ?>
 
 <!-- answer_row -->
-<div id='javatbd<?php echo $myfname; ?>' class='form-group answer-item radio-item radio' <?php echo $sDisplayStyle; ?> >
+<div id='javatbd<?php echo $myfname; ?>' class='col-xs-12 form-group answer-item radio-item radio' <?php echo $sDisplayStyle; ?> >
     <input
         class="radio"
         type="radio"
diff --git a/application/views/survey/questions/listradio/rows/answer_row_noanswer.php b/application/views/survey/questions/listradio/rows/answer_row_noanswer.php
index 0af1306837f..3579253308c 100644
--- a/application/views/survey/questions/listradio/rows/answer_row_noanswer.php
+++ b/application/views/survey/questions/listradio/rows/answer_row_noanswer.php
@@ -9,7 +9,7 @@
 ?>
 
 <!-- answer_row_noanswer -->
-<div  class="form-group answer-item radio-item no-anwser-item radio">
+<div  class="col-xs-12 form-group answer-item radio-item no-anwser-item radio">
     <input
     class="radio"
     type="radio"
diff --git a/application/views/survey/questions/listradio/rows/answer_row_other.php b/application/views/survey/questions/listradio/rows/answer_row_other.php
index 7ccb024a339..eb39f9c6d20 100644
--- a/application/views/survey/questions/listradio/rows/answer_row_other.php
+++ b/application/views/survey/questions/listradio/rows/answer_row_other.php
@@ -17,7 +17,7 @@
 ?>
 
 <!-- answer_row_other -->
-<div id='javatbd<?php echo $myfname; ?>' class='form-group answer-item col-xs-12 radio-item other-item other radio' <?php echo $sDisplayStyle; ?> >
+<div id='javatbd<?php echo $myfname; ?>' class='col-xs-12 form-group answer-item radio-item radio' <?php echo $sDisplayStyle; ?> >
     <!-- Checkbox + label -->
     <div class="pull-left othertext-label-checkox-container">
         <input
@@ -39,12 +39,12 @@ class="radio"
              This field is related to the input thanks to attribute aria-labelledby
         -->
         <div class="label-text label-clickable" id="label-SOTH<?php echo $name; ?>">
-                <?php echo $othertext; ?>
+                <?php echo $othertext; ?>&nbsp;
         </div>
     </div>
 
     <!-- comment -->
-    <div class="pull-left">
+    <div class="pull-left ">
         <input
         type="text"
         class="form-control text <?php echo $kpclass; ?> input-sm"
diff --git a/templates/default/css/template.css b/templates/default/css/template.css
index 5ae8172a193..6cb2635e33b 100644
--- a/templates/default/css/template.css
+++ b/templates/default/css/template.css
@@ -666,26 +666,33 @@ table > tbody > tr > td.ddprefix {
         padding-top: 11px;
     }
 
+    .col-xs-12.question-container {
+        padding-right: 0;
+        padding-left: 0;
+    }
+
 }
 
 /** On small phones, leave some more space */
 @media only screen and (max-width: 400px) {
 
-    .col-sm-12 {
-        padding: 0;
-    }
-
-    .col-xs-12 {
-        padding-right: 0;
-        padding-left: 0;
-    }
-
     .array-by-columns-div .radio-list {
         border: 1px solid #ccc;
         padding: 1em;
         margin: 1em;
     }
 
+    /*
+    .col-sm-12.answer {
+        padding-left: 0;
+        padding-right: 0;
+    }
+    */
+
+    .no-more-tables tbody {
+        padding-left: 0;
+        padding-right: 0;
+    }
 
     /* For yes-no question, shrink the buttons a bit on phone screens */
     .btn-lg, .btn-group-lg label {