Skip to content

Commit 5b92bc1

Browse files
Cherrgzeripath
authored andcommitted
ui - cut timeline length with last element on issue view (#7355)
* cut timeline length with last element on issue view fix #7304 - lightly enlight dark theme issue timeline color Signed-off-by: Michael Gnehr <[email protected]> * remove new container Signed-off-by: Michael Gnehr <[email protected]>
1 parent 7166629 commit 5b92bc1

File tree

5 files changed

+31
-7
lines changed

5 files changed

+31
-7
lines changed

public/css/index.css

+3-1
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,9 @@ footer .ui.left,footer .ui.right{line-height:40px}
524524
.repository.view.issue .pull .review-item .type-icon{float:right;margin-right:1em}
525525
.repository.view.issue .pull .review-item .divider{margin:.5rem 0}
526526
.repository.view.issue .pull .review-item .review-content{padding:1em 0 1em 3.8em}
527-
.repository.view.issue .comment-list:before{display:block;content:"";position:absolute;margin-top:12px;margin-bottom:14px;top:0;bottom:0;left:96px;width:2px;background-color:#f3f3f3;z-index:-1}
527+
.repository.view.issue .comment-list:not(.prevent-before-timeline):before{display:block;content:"";position:absolute;margin-top:12px;margin-bottom:14px;top:0;bottom:0;left:96px;width:2px;background-color:#f3f3f3;z-index:-1}
528+
.repository.view.issue .comment-list .timeline-line{position:relative;display:block;width:100%;max-width:100%}
529+
.repository.view.issue .comment-list .timeline-line:before{display:block;content:"";position:absolute;margin-top:12px;margin-bottom:14px;top:0;bottom:0;left:82px;width:2px;background-color:#f3f3f3;z-index:-1}
528530
.repository.view.issue .comment-list .comment .avatar{width:3em}
529531
.repository.view.issue .comment-list .comment .tag{color:#767676;margin-top:3px;padding:2px 5px;font-size:12px;border:1px solid rgba(0,0,0,.1);border-radius:3px}
530532
.repository.view.issue .comment-list .comment .actions .item{float:left}

public/css/theme-arc-green.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ footer{background:#2e323e;border-top:1px solid #313131}
118118
.repository.new.issue .comment.form .content:after{border-right-color:#353945}
119119
.repository.view.issue .comment-list .comment .content .header:before{border-right-color:#404552}
120120
.repository.new.issue .comment.form .content:before{border-right-color:#353945}
121-
.repository.view.issue .comment-list:before{background-color:#313c47}
121+
.repository.view.issue .comment-list .timeline-line:before,.repository.view.issue .comment-list:not(.prevent-before-timeline):before{background-color:#3b4954}
122122
.repository .comment.form .content .form:after{border-right-color:#313c47}
123123
.repository .comment.form .content .form:before{border-right-color:#313c47}
124124
.ui .text.grey a:hover{color:#dbdbdb!important}

public/less/_repository.less

+22-1
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@
749749
}
750750

751751
.comment-list {
752-
&:before {
752+
&:not(.prevent-before-timeline):before {
753753
display: block;
754754
content: "";
755755
position: absolute;
@@ -763,6 +763,27 @@
763763
z-index: -1;
764764
}
765765

766+
.timeline-line {
767+
position: relative;
768+
display: block;
769+
width: 100%;
770+
max-width: 100%;
771+
772+
&:before {
773+
display: block;
774+
content: "";
775+
position: absolute;
776+
margin-top: 12px;
777+
margin-bottom: 14px;
778+
top: 0;
779+
bottom: 0;
780+
left: 82px;
781+
width: 2px;
782+
background-color: #f3f3f3;
783+
z-index: -1;
784+
}
785+
}
786+
766787
.comment {
767788
.avatar {
768789
width: @comment-avatar-width;

public/less/themes/arc-green.less

+3-2
Original file line numberDiff line numberDiff line change
@@ -619,8 +619,9 @@ a.ui.basic.green.label:hover {
619619
border-right-color: #353945;
620620
}
621621

622-
.repository.view.issue .comment-list:before {
623-
background-color: #313c47;
622+
.repository.view.issue .comment-list:not(.prevent-before-timeline):before,
623+
.repository.view.issue .comment-list .timeline-line:before {
624+
background-color: #3b4954;
624625
}
625626

626627
.repository .comment.form .content .form:after {

templates/repo/issue/view_content.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
{{end}}
1010

1111
{{ $createdStr:= TimeSinceUnix .Issue.CreatedUnix $.Lang }}
12-
<div class="twelve wide column comment-list">
13-
<ui class="ui comments">
12+
<div class="twelve wide column comment-list prevent-before-timeline">
13+
<ui class="ui comments timeline-line">
1414
<div class="comment">
1515
<a class="avatar" {{if gt .Issue.Poster.ID 0}}href="{{.Issue.Poster.HomeLink}}"{{end}}>
1616
<img src="{{.Issue.Poster.RelAvatarLink}}">

0 commit comments

Comments
 (0)