Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ui - cut timeline length with last element on issue view #7355

Merged
merged 7 commits into from
Jul 6, 2019
Merged

ui - cut timeline length with last element on issue view #7355

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a39fe62
cut timeline length with last element on issue view
Cherrg Jul 4, 2019
370341a
remove new container
Cherrg Jul 6, 2019
789752e
Merge branch 'master' into issue_timeline_length
Cherrg Jul 6, 2019
d7d000e
Merge branch 'master' into issue_timeline_length
techknowlogick Jul 6, 2019
1cd73b8
Merge branch 'master' into issue_timeline_length
lafriks Jul 6, 2019
45f1a3d
Merge branch 'master' into issue_timeline_length
lafriks Jul 6, 2019
b7ca37a
Merge branch 'master' into issue_timeline_length
zeripath Jul 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion public/css/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,9 @@ footer .ui.left,footer .ui.right{line-height:40px}
.repository.view.issue .pull .review-item .type-icon{float:right;margin-right:1em}
.repository.view.issue .pull .review-item .divider{margin:.5rem 0}
.repository.view.issue .pull .review-item .review-content{padding:1em 0 1em 3.8em}
.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}
.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}
.repository.view.issue .comment-list .timeline-line{position:relative;display:block;width:100%;max-width:100%}
.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}
.repository.view.issue .comment-list .comment .avatar{width:3em}
.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}
.repository.view.issue .comment-list .comment .actions .item{float:left}
Expand Down
2 changes: 1 addition & 1 deletion public/css/theme-arc-green.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ footer{background:#2e323e;border-top:1px solid #313131}
.repository.new.issue .comment.form .content:after{border-right-color:#353945}
.repository.view.issue .comment-list .comment .content .header:before{border-right-color:#404552}
.repository.new.issue .comment.form .content:before{border-right-color:#353945}
.repository.view.issue .comment-list:before{background-color:#313c47}
.repository.view.issue .comment-list .timeline-line:before,.repository.view.issue .comment-list:not(.prevent-before-timeline):before{background-color:#3b4954}
.repository .comment.form .content .form:after{border-right-color:#313c47}
.repository .comment.form .content .form:before{border-right-color:#313c47}
.ui .text.grey a:hover{color:#dbdbdb!important}
Expand Down
23 changes: 22 additions & 1 deletion public/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,7 @@
}

.comment-list {
&:before {
&:not(.prevent-before-timeline):before {
display: block;
content: "";
position: absolute;
Expand All @@ -763,6 +763,27 @@
z-index: -1;
}

.timeline-line {
position: relative;
display: block;
width: 100%;
max-width: 100%;

&: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;
}
}

.comment {
.avatar {
width: @comment-avatar-width;
Expand Down
5 changes: 3 additions & 2 deletions public/less/themes/arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,8 +619,9 @@ a.ui.basic.green.label:hover {
border-right-color: #353945;
}

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

.repository .comment.form .content .form:after {
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/issue/view_content.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
{{end}}

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