From f719e2e80619564acc929254eb66251d863dc6fe Mon Sep 17 00:00:00 2001 From: Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> Date: Sun, 8 Nov 2020 00:15:09 +0100 Subject: [PATCH] Fix double border introduced by #13434 (#13457) Co-authored-by: techknowlogick Co-authored-by: zeripath --- templates/repo/diff/comments.tmpl | 2 +- templates/repo/issue/view_content.tmpl | 2 +- templates/repo/issue/view_content/comments.tmpl | 6 +++--- web_src/less/_repository.less | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 803627060e..fa553fba96 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -9,7 +9,7 @@ {{end}} -
+
{{if .OriginalAuthor }} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 1dadd2ef96..81e2c80c3c 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -19,7 +19,7 @@ {{end}} -
+
{{if .Issue.OriginalAuthor }} diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c814932d14..6f18980072 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -18,7 +18,7 @@ {{end}} -
+
{{if .OriginalAuthor }} @@ -427,8 +427,8 @@
{{if .Content}}
-
-
+
+
{{if .OriginalAuthor }} {{ .OriginalAuthor }} {{if $.Repository.OriginalURL}}({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}} diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index d3190f222d..9b4383c145 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -997,7 +997,7 @@ } } - .content { + .comment-container { border: 1px solid var(--color-secondary); border-radius: var(--border-radius); @@ -2791,7 +2791,7 @@ } } -.comment:target .content { +.comment:target .comment-container { border-color: var(--color-primary) !important; box-shadow: 0 0 0 3px var(--color-primary-alpha-30) !important; }