Merge pull request #136 from humhub/fix/282-dashboard-horizontally-sc…

…rollable Fix wall stream horizontally scrollable
humhub · Jun 18, 2024 · 3902f21 · 3902f21
2 parents 4710f6c + 64597ae
commit 3902f21
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -4,6 +4,7 @@ Changelog
 1.3.5 (Unreleased)
 ----------------------
 - Fix #129: Fix memory usage on integrity check
+- Fix #136: Fix wall stream horizontally scrollable
 
 1.3.4 (November, 10, 2023)
 --------------------------

diff --git a/widgets/views/_answer.php b/widgets/views/_answer.php
@@ -16,7 +16,7 @@
 $voteText = Yii::t('PollsModule.base', '{n,plural,=1{# {htmlTagBegin}vote{htmlTagEnd}}other{# {htmlTagBegin}votes{htmlTagEnd}}}', [
     'n' => $voteCount,
     'htmlTagBegin' => '<span class="hidden-xs">',
-    'htmlTagEnd' => '</span>'
+    'htmlTagEnd' => '</span>',
 ]);
 
 $userlist = ''; // variable for users output
@@ -34,9 +34,9 @@
     }
 }
 ?>
-<div class="row">
+<div class="row" style="margin:0">
     <?php if (!$poll->hasUserVoted() && !$poll->closed) : ?>
-        <div class="col-xs-1" style="margin-top:6px">
+        <div class="col-xs-1" style="margin-top:6px;padding-left:0">
             <?php if ($poll->allow_multiple) : ?>
                 <?= Html::checkBox('answers[' . $answer->id . ']'); ?>
             <?php else : ?>
@@ -45,21 +45,21 @@
         </div>
     <?php endif; ?>
 
-    <div class="col-sm-7 col-xs-9">
+    <div class="col-sm-7 col-xs-9" style="padding-left:0">
         <span><?= Html::encode($answer->answer) ?></span>
         <div class="progress">
             <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="<?= $percent ?>" aria-valuemin="0" aria-valuemax="100" style="width:<?= $percent ?>%"></div>
         </div>
     </div>
 
     <?php if ($poll->isShowResult()) : ?>
-        <div class="col-xs-2 text-nowrap tt" style="width:15%;margin-top:14px" data-toggle="tooltip" data-placement="top" data-original-title="<?= $userlist ?>">
+        <div class="col-xs-2 text-nowrap tt" style="margin-top:14px;padding:0" data-toggle="tooltip" data-placement="top" data-original-title="<?= $userlist ?>">
             <?= !$poll->anonymous && $voteCount
                 ? Link::asLink($voteText, $contentContainer->createUrl('/polls/poll/user-list-results', [
-                        'pollId' => $poll->id,
-                        'answerId' => $answer->id
-                    ]))->options(['data-target' => '#globalModal'])
+                    'pollId' => $poll->id,
+                    'answerId' => $answer->id,
+                ]))->options(['data-target' => '#globalModal'])
                 : $voteText ?>
         </div>
     <?php endif; ?>
-</div>
+</div>