Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix wall stream horizontally scrollable #136

Merged
merged 1 commit into from
Jun 18, 2024
Merged

Fix wall stream horizontally scrollable #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
--------------------------
Expand Down
18 changes: 9 additions & 9 deletions widgets/views/_answer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 : ?>
Expand All @@ -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>
Loading