Merge branch 'bootstrap5' of https://github.com/NodeBB/NodeBB into bootstrap5

This commit is contained in:
Barış Soner Uşaklı
2023-01-31 11:05:27 -05:00
2 changed files with 2 additions and 2 deletions

View File

@@ -1,4 +1,4 @@
<div component="topic/deleted/message" class="alert alert-warning{{{ if !deleted }}} hidden{{{ end }}} clearfix">
<div component="topic/deleted/message" class="alert alert-warning mt-3{{{ if !deleted }}} hidden{{{ end }}} clearfix">
<span class="float-start">[[topic:deleted_message]]</span>
<span class="float-end">
{{{ if deleter }}}

View File

@@ -1,4 +1,4 @@
<div component="topic/merged/message" class="alert alert-warning clearfix">
<div component="topic/merged/message" class="alert alert-warning mt-3 clearfix">
<span class="float-start">[[topic:merged_message, {config.relative_path}/topic/{mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
<span class="float-end">
<a href="{config.relative_path}/user/{merger.userslug}">