From 6d30200862ecbd31320bc1331a9ba53fcb555c6c Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Fri, 14 Jul 2023 20:41:18 +0200 Subject: [PATCH 1/2] Align add line comment button with github version use a real button and add a aria-label see https://codeberg.org/forgejo/forgejo/issues/998 for explanation --- options/locale/locale_en-US.ini | 1 + templates/repo/diff/section_split.tmpl | 16 ++++++++-------- templates/repo/diff/section_unified.tmpl | 4 ++-- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 8c7990e0d4dea..77003351f5d91 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2375,6 +2375,7 @@ diff.show_more = Show More diff.load = Load Diff diff.generated = generated diff.vendored = vendored +diff.comment.add_line_comment = Add line comment diff.comment.placeholder = Leave a comment diff.comment.markdown_info = Styling with markdown is supported. diff.comment.add_single_comment = Add single comment diff --git a/templates/repo/diff/section_split.tmpl b/templates/repo/diff/section_split.tmpl index 6a8a105e2b751..a1a5f5ba56994 100644 --- a/templates/repo/diff/section_split.tmpl +++ b/templates/repo/diff/section_split.tmpl @@ -47,9 +47,9 @@ {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* - */}}{{/* + */}}{{/* */}}{{end}}{{/* */}}{{if $line.LeftIdx}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $leftDiff "locale" $.root.locale}}{{/* @@ -62,9 +62,9 @@ {{if $match.RightIdx}}{{end}} {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* - */}}{{/* + */}}{{/* */}}{{end}}{{/* */}}{{if $match.RightIdx}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $rightDiff "locale" $.root.locale}}{{/* @@ -79,9 +79,9 @@ {{if $line.LeftIdx}}{{end}} {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 2))}}{{/* - */}}{{/* + */}}{{/* */}}{{end}}{{/* */}}{{if $line.LeftIdx}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* @@ -94,9 +94,9 @@ {{if $line.RightIdx}}{{end}} {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles (not (eq .GetType 3))}}{{/* - */}}{{/* + */}}{{/* */}}{{end}}{{/* */}}{{if $line.RightIdx}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* diff --git a/templates/repo/diff/section_unified.tmpl b/templates/repo/diff/section_unified.tmpl index 8f9c122f05fd5..98e382a0cb0e6 100644 --- a/templates/repo/diff/section_unified.tmpl +++ b/templates/repo/diff/section_unified.tmpl @@ -52,9 +52,9 @@ {{else}} {{/* */}}{{if and $.root.SignedUserID $.root.PageIsPullFiles}}{{/* - */}}{{/* + */}}{{/* */}}{{end}}{{/* */}}{{template "repo/diff/section_code" dict "diff" $inlineDiff "locale" $.root.locale}}{{/* */}} From c7cc566584ac8c21e2fab9f7ed8c82518ebb0600 Mon Sep 17 00:00:00 2001 From: Sebastian Sauer Date: Fri, 14 Jul 2023 21:06:26 +0200 Subject: [PATCH 2/2] Show add-code-comment when navigating through diff by tab --- web_src/css/review.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web_src/css/review.css b/web_src/css/review.css index f82a6e7f37067..a4c4efd029d14 100644 --- a/web_src/css/review.css +++ b/web_src/css/review.css @@ -36,6 +36,10 @@ opacity: 1; } +.ui.button.add-code-comment:focus { + opacity: 1; +} + .repository .diff-file-box .code-diff .add-comment-left, .repository .diff-file-box .code-diff .add-comment-right, .repository .diff-file-box .code-diff .add-code-comment .add-comment-left,