Skip to content

Fix: .row HTML elements without .container overflow #404

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

Merged
luke- merged 2 commits into from
Dec 18, 2025
Merged

Fix: .row HTML elements without .container overflow #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b497dc1
Fix: `.row` HTML elements without `.container` overflow
marc-farre Dec 17, 2025
2753578
Add PR ID to CHANGELOG
marc-farre Dec 17, 2025
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
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

2.5.5 (Unreleased)
-----------------------
- Fix #404: `.row` HTML elements without `.container` overflow

2.5.4 (December 12, 2025)
-------------------------
- Fix #330: Update module resources path
Expand Down
2 changes: 1 addition & 1 deletion module.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Wiki",
"description": "Create and edit pages with this powerful tool. Build a collaborative knowledge base, view and share information with your colleagues.",
"keywords": ["wiki"],
"version": "2.5.4",
"version": "2.5.5",
"humhub": {
"minVersion": "1.18"
},
Expand Down
24 changes: 13 additions & 11 deletions views/overview/list-categories.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,22 @@
?>
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<?php WikiContent::begin(['cssClass' => 'wiki-page-content']) ?>
<div class="wiki-page-content-header clearfix">
<h3><?= Html::encode($settings->module_label) ?></h3>
<?= WikiSearchForm::widget(['contentContainer' => $contentContainer, 'cssClass' => 'float-start']) ?>
<div class="wiki-page-content-header-actions">
<?= Button::accent(Yii::t('WikiModule.base', 'Last edited'))->sm()->link(Url::toLastEdited($contentContainer))->cssClass(Helper::isEnterpriseTheme() ? 'd-lg-none' : '') ?>
<?= Button::accent($createPageTitle)->icon('fa-plus')->sm()->link(Url::toWikiCreate($contentContainer))->visible($canCreate) ?>
<div class="container gx-0 overflow-x-hidden">
<div class="row">
<?php WikiContent::begin(['cssClass' => 'wiki-page-content']) ?>
<div class="wiki-page-content-header clearfix">
<h3><?= Html::encode($settings->module_label) ?></h3>
<?= WikiSearchForm::widget(['contentContainer' => $contentContainer, 'cssClass' => 'float-start']) ?>
<div class="wiki-page-content-header-actions">
<?= Button::accent(Yii::t('WikiModule.base', 'Last edited'))->sm()->link(Url::toLastEdited($contentContainer))->cssClass(Helper::isEnterpriseTheme() ? 'd-lg-none' : '') ?>
<?= Button::accent($createPageTitle)->icon('fa-plus')->sm()->link(Url::toWikiCreate($contentContainer))->visible($canCreate) ?>
</div>
</div>
</div>

<?= CategoryListView::widget(['contentContainer' => $contentContainer]) ?>
<?= CategoryListView::widget(['contentContainer' => $contentContainer]) ?>

<?php WikiContent::end() ?>
<?php WikiContent::end() ?>
</div>
</div>
</div>
</div>
34 changes: 17 additions & 17 deletions views/overview/no-pages.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,23 +20,23 @@
<div class="panel panel-default wiki-bg">

<div class="panel-body">

<div class="row">
<?php WikiContent::begin() ?>

<div class="text-center wiki-welcome">
<h1><?= Yii::t('WikiModule.base', 'There are no entries yet :(') ?></h1>
<?php if ($canCreatePage): ?>
<h2><?= Yii::t('WikiModule.base', 'Get your very own knowledge base off the ground by being the first one to create a Wiki page! Gather information, facilitate knowledge transfer and make it available to your users in the easiest way possible.') ?></h2>
<br>
<p>
<?= Button::accent( Yii::t('WikiModule.base', 'Let\'s go!'))->link(Url::toWikiCreate($contentContainer)) ?>
</p>
<?php endif; ?>
</div>

<?php WikiContent::end() ?>

<div class="container gx-0 overflow-x-hidden">
<div class="row">
<?php WikiContent::begin() ?>

<div class="text-center wiki-welcome">
<h1><?= Yii::t('WikiModule.base', 'There are no entries yet :(') ?></h1>
<?php if ($canCreatePage): ?>
<h2><?= Yii::t('WikiModule.base', 'Get your very own knowledge base off the ground by being the first one to create a Wiki page! Gather information, facilitate knowledge transfer and make it available to your users in the easiest way possible.') ?></h2>
<br>
<p>
<?= Button::accent( Yii::t('WikiModule.base', 'Let\'s go!'))->link(Url::toWikiCreate($contentContainer)) ?>
</p>
<?php endif; ?>
</div>

<?php WikiContent::end() ?>
</div>
</div>
</div>
</div>
88 changes: 45 additions & 43 deletions views/page/diff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,58 +17,60 @@
?>
<div class="panel panel-default">
<div class="panel-body">
<div class="row">
<?php WikiContent::begin(['cssClass' => 'wiki-page-content wiki-page-diff']) ?>
<div class="container gx-0 overflow-x-hidden">
<div class="row">
<?php WikiContent::begin(['cssClass' => 'wiki-page-content wiki-page-diff']) ?>

<?= $this->render('_view_header', [
'page' => $page,
'buttons' => WikiMenu::LINK_REVERT,
'revision' => $revision1
]) ?>
<?= $this->render('_view_header', [
'page' => $page,
'buttons' => WikiMenu::LINK_REVERT,
'revision' => $revision1
]) ?>

<div class="row">
<div class="col-6">
<strong>
<?php if ($revision1->isCurrentlyEditing) : ?>
<?= Yii::t('WikiModule.base', 'Your current version'); ?>
<?php else : ?>
<?= Yii::t('WikiModule.base', 'Edited at'); ?>
<?= Yii::$app->formatter->asDateTime($revision1->revision); ?>
<?= Yii::t('WikiModule.base', 'by'); ?>
<?= Html::a(Html::encode($revision1->author->displayName), $revision1->author->getUrl(), ['class' => 'wiki-author-link']); ?>
<?php endif; ?>
</strong>
</div>
<div class="col-6">
<strong>
<?php if ($revision2->isCurrentlyEditing) : ?>
<?= Yii::t('WikiModule.base', 'Your current version'); ?>
<?php else : ?>
<?= Yii::t('WikiModule.base', 'Edited at'); ?>
<?= Yii::$app->formatter->asDateTime($revision2->revision); ?>
<?= Yii::t('WikiModule.base', 'by'); ?>
<?= Html::a(Html::encode($revision2->author->displayName), $revision2->author->getUrl(), ['class' => 'wiki-author-link']); ?>
<?php endif; ?>
</strong>
<div class="row">
<div class="col-6">
<strong>
<?php if ($revision1->isCurrentlyEditing) : ?>
<?= Yii::t('WikiModule.base', 'Your current version'); ?>
<?php else : ?>
<?= Yii::t('WikiModule.base', 'Edited at'); ?>
<?= Yii::$app->formatter->asDateTime($revision1->revision); ?>
<?= Yii::t('WikiModule.base', 'by'); ?>
<?= Html::a(Html::encode($revision1->author->displayName), $revision1->author->getUrl(), ['class' => 'wiki-author-link']); ?>
<?php endif; ?>
</strong>
</div>
<div class="col-6">
<strong>
<?php if ($revision2->isCurrentlyEditing) : ?>
<?= Yii::t('WikiModule.base', 'Your current version'); ?>
<?php else : ?>
<?= Yii::t('WikiModule.base', 'Edited at'); ?>
<?= Yii::$app->formatter->asDateTime($revision2->revision); ?>
<?= Yii::t('WikiModule.base', 'by'); ?>
<?= Html::a(Html::encode($revision2->author->displayName), $revision2->author->getUrl(), ['class' => 'wiki-author-link']); ?>
<?php endif; ?>
</strong>
</div>
</div>
</div>

<hr class="wiki-headline-seperator">
<hr class="wiki-headline-seperator">

<div class="row">
<div class="col-6 wiki-page-revision1">
<div id="wiki-page-revision1" class="markdown-render" data-ui-widget="wiki.Page" data-ui-init="1" style="display:none">
<?= WikiRichText::output($revision1->content, ['id' => 'wiki-page-richtext']) ?>
<div class="row">
<div class="col-6 wiki-page-revision1">
<div id="wiki-page-revision1" class="markdown-render" data-ui-widget="wiki.Page" data-ui-init="1" style="display:none">
<?= WikiRichText::output($revision1->content, ['id' => 'wiki-page-richtext']) ?>
</div>
</div>
</div>
<div class="col-6 wiki-page-revision2">
<div class="markdown-render" data-ui-widget="wiki.Page" data-ui-init="1" data-diff="#wiki-page-revision1" style="display:none">
<?= WikiRichText::output($revision2->content, ['id' => 'wiki-page-richtext']) ?>
<div class="col-6 wiki-page-revision2">
<div class="markdown-render" data-ui-widget="wiki.Page" data-ui-init="1" data-diff="#wiki-page-revision1" style="display:none">
<?= WikiRichText::output($revision2->content, ['id' => 'wiki-page-richtext']) ?>
</div>
</div>
</div>
</div>

<?php WikiContent::end() ?>
<?php WikiContent::end() ?>
</div>
</div>
</div>
</div>
Loading