Fix double border introduced by #13434 (#13457)

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: zeripath <art27@cantab.net>

diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl
index 803627060e4931132fbb6f36636a6b24c2f65c7c..fa553fba96ea3374a2261aec49051cd89045d4bf 100644 (file)
--- a/templates/repo/diff/comments.tmpl
+++ b/templates/repo/diff/comments.tmpl
@@ -9,7 +9,7 @@
                        <img src="{{.Poster.RelAvatarLink}}">
                </a>
        {{end}}
-       <div class="content">
+       <div class="content comment-container">
                <div class="ui top attached header comment-header df ac sb">
                        <div class="comment-header-left df ac">
                                {{if .OriginalAuthor }}

diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index 1dadd2ef96a3aa19744c2349b3471056c68b9f2b..81e2c80c3c48c566e4922d662774a81e76d6ef47 100644 (file)
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -19,7 +19,7 @@
                                        <img src="{{.Issue.Poster.RelAvatarLink}}">
                                </a>
                        {{end}}
-                               <div class="content">
+                               <div class="content comment-container">
                                        <div class="ui top attached header comment-header df ac sb">
                                                <div class="comment-header-left df ac">
                                                        {{if .Issue.OriginalAuthor }}

diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl
index c814932d1412ba1382b8b09cbb169876ddd08307..6f189800727a2cbe11a932a42fe7c3ef8309a560 100644 (file)
--- a/templates/repo/issue/view_content/comments.tmpl
+++ b/templates/repo/issue/view_content/comments.tmpl
@@ -18,7 +18,7 @@
                                <img src="{{.Poster.RelAvatarLink}}">
                        </a>
                {{end}}
-                       <div class="content">
+                       <div class="content comment-container">
                                <div class="ui top attached header comment-header df ac sb">
                                        <div class="comment-header-left df ac">
                                                {{if .OriginalAuthor }}
@@ -427,8 +427,8 @@
                        </div>
                        {{if .Content}}
                        <div class="timeline-item comment">
-                               <div class="content">
-                                       <div class="ui top attached header arrow-top">
+                               <div class="content comment-container">
+                                       <div class="ui top attached header comment-header df ac sb">
                                                <span class="text grey">
                                                        {{if .OriginalAuthor }}
                                                                <span class="text black"><i class="fa {{MigrationIcon $.Repository.GetOriginalURLHostname}}" aria-hidden="true"></i> {{ .OriginalAuthor }}</span><span class="text grey"> {{if $.Repository.OriginalURL}}</span><span class="text migrate">({{$.i18n.Tr "repo.migrated_from" $.Repository.OriginalURL $.Repository.GetOriginalURLHostname | Safe }}){{end}}</span>

diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index d3190f222df97d979814f5ca7cb9c8672ce788bd..9b4383c1457272b417e3d163e77a8d422ebb1114 100644 (file)
--- 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;
 }