From 382db9e8de0b749f6cb8b248e73577643a067c52 Mon Sep 17 00:00:00 2001 From: JakobDev <jakobdev@gmx.de> Date: Sat, 28 Dec 2024 20:19:58 +0100 Subject: [PATCH] Fix overflow in git notes (cherry picked from commit dcdeb23cc332faad8ff0275549c01be194ae844d) --- templates/repo/commit_page.tmpl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index c7361663b2..66be0c143d 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -263,7 +263,7 @@ </div> {{end}} {{if .NoteRendered}} - <div class="ui top attached header segment git-notes"> + <div class="ui top attached header segment git-notes tw-flex tw-gap-1 tw-flex-wrap"> {{svg "octicon-note" 16 "tw-mr-2"}} {{ctx.Locale.Tr "repo.diff.git-notes"}}: {{if .NoteAuthor}} @@ -277,11 +277,11 @@ {{else}} <strong>{{.NoteCommit.Author.Name}}</strong> {{end}} - <span class="text grey" id="note-authored-time">{{DateUtils.TimeSince .NoteCommit.Author.When}}</span> + <span class="text grey tw-flex-1" id="note-authored-time">{{DateUtils.TimeSince .NoteCommit.Author.When}}</span> {{if and ($.Permission.CanWrite $.UnitTypeCode) (not $.Repository.IsArchived) (not .IsDeleted)}} - <div class="ui right"> - <button id="commit-notes-edit-button" class="ui tiny primary button">{{ctx.Locale.Tr "edit"}}</button> - <button class="ui tiny button red show-modal" data-modal="#delete-note-modal">{{ctx.Locale.Tr "remove"}}</button> + <div class="ui tw-flex tw-items-center"> + <button id="commit-notes-edit-button" class="ui tiny primary button tw-py-[6px] tw-px-[10px]">{{ctx.Locale.Tr "edit"}}</button> + <button class="ui tiny button red show-modal tw-py-[6px] tw-px-[10px]" data-modal="#delete-note-modal">{{ctx.Locale.Tr "remove"}}</button> </div> <div class="ui small modal" id="delete-note-modal"> <div class="header">