From 0903b1ac8c7b64bb571d02cdd69fa671cc1c18c1 Mon Sep 17 00:00:00 2001 From: 赵智超 <1012112796@qq.com> Date: Wed, 20 May 2020 20:47:24 +0800 Subject: Add push commits history comment on PR time-line (#11167) * Add push commits history comment on PR time-line * Add notify by email and ui of this comment type also Signed-off-by: a1012112796 <1012112796@qq.com> * Add migrations for IsForcePush * fix wrong force-push judgement * Apply suggestions from code review * Remove commit number check * add own notify fun * fix some typo Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> * fix lint * fix style again, I forgot something before * Change email notify way * fix api * add number check if It's force-push * Add repo commit link fuction remove unnecessary check skip show push commits comment which not have commits alive * Update issue_comment.go * Apply suggestions from code review Co-authored-by: mrsdizzie * Apply suggestions from code review * fix ui view Co-authored-by: silverwind * fix height * remove unnecessary style define * simplify GetBranchName * Apply suggestions from code review * save commit ids and isForce push by json * simplify GetBranchName * fix bug Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com> Co-authored-by: mrsdizzie Co-authored-by: Lauris BH Co-authored-by: silverwind --- web_src/less/_repository.less | 79 ++++++++++++++++++++++++++++++++ web_src/less/themes/theme-arc-green.less | 5 ++ 2 files changed, 84 insertions(+) (limited to 'web_src') diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less index 16ccd3744b..aedf6c0eaa 100644 --- a/web_src/less/_repository.less +++ b/web_src/less/_repository.less @@ -762,6 +762,12 @@ padding-bottom: 0 !important; } + .badge.badge-commit { + border-color: transparent; + background: radial-gradient(white 60%, transparent 60%) no-repeat; + height: 0 !important; + } + .badge { width: 32px; height: 32px; @@ -804,6 +810,16 @@ line-height: 30px; } + &.event.small-line-spacing { + padding: 2px 0 0 15px; + } + + &.event > .commit-status-link { + float: right; + margin-right: 8px; + margin-top: 4px; + } + .author { font-weight: 700; } @@ -1040,6 +1056,69 @@ } } + & > .shabox { + .sha.label { + margin: 0; + border: 1px solid #bbbbbb; + + &.isSigned.isWarning { + border: 1px solid #db2828; + background: fade(#db2828, 10%); + + .shortsha { + display: inline-block; + padding-top: 1px; + } + + &:hover { + background: fade(#db2828, 30%) !important; + } + } + + &.isSigned.isVerified { + border: 1px solid #21ba45; + background: fade(#21ba45, 10%); + + .shortsha { + display: inline-block; + padding-top: 1px; + } + + &:hover { + background: fade(#21ba45, 30%) !important; + } + } + + &.isSigned.isVerifiedUntrusted { + border: 1px solid #fbbd08; + background: fade(#fbbd08, 10%); + + .shortsha { + display: inline-block; + padding-top: 1px; + } + + &:hover { + background: fade(#fbbd08, 30%) !important; + } + } + + &.isSigned.isVerifiedUnmatched { + border: 1px solid #f2711c; + background: fade(#f2711c, 10%); + + .shortsha { + display: inline-block; + padding-top: 1px; + } + + &:hover { + background: fade(#f2711c, 30%) !important; + } + } + } + } + .detail { font-size: .9rem; margin-top: 5px; diff --git a/web_src/less/themes/theme-arc-green.less b/web_src/less/themes/theme-arc-green.less index 8caadd151d..e893307c51 100644 --- a/web_src/less/themes/theme-arc-green.less +++ b/web_src/less/themes/theme-arc-green.less @@ -704,6 +704,11 @@ a.ui.basic.green.label:hover { color: #9e9e9e; } +.repository.view.issue .comment-list .timeline-item .badge.badge-commit { + background: radial-gradient(#383c4a 60%, transparent 60%) no-repeat; + height: 0 !important; +} + .repository .comment.form .content .form:after { border-right-color: #313c47; } -- cgit v1.2.3