summaryrefslogtreecommitdiffstats
path: root/public
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-06-30 15:57:59 +0800
committerzeripath <art27@cantab.net>2019-06-30 08:57:59 +0100
commitff85dd3e12c05be98d9132de2e629523d096f712 (patch)
treec0b5d69eef2fd859204437bd8b206e06a7b8a47d /public
parent1e46eedce721e22e3e1e94eec6e0afccd36147c1 (diff)
downloadgitea-ff85dd3e12c05be98d9132de2e629523d096f712.tar.gz
gitea-ff85dd3e12c05be98d9132de2e629523d096f712.zip
Add commit statuses reports on pull request view (#6845)
* Add commit statuses reports on pull view * Add some translations * improve the UI * fix fmt * fix tests * add a new test git repo to fix tests * fix bug when headRepo or headBranch missing * fix tests * fix tests * fix consistency * fix tests * fix tests * change the test repo * fix tests * fix tests * fix migration * keep db size consistency * fix translation * change commit hash status table unique index * remove unused table * use char instead varchar * make hashCommitStatusContext private * split merge section with status check on pull view ui * fix tests; fix arc-green theme on pull ui
Diffstat (limited to 'public')
-rw-r--r--public/css/index.css1
-rw-r--r--public/css/theme-arc-green.css1
-rw-r--r--public/less/_repository.less5
-rw-r--r--public/less/themes/arc-green.less5
4 files changed, 12 insertions, 0 deletions
diff --git a/public/css/index.css b/public/css/index.css
index 2bf2f96181..3418847a4f 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -535,6 +535,7 @@ footer .ui.left,footer .ui.right{line-height:40px}
.repository.view.issue .comment-list .comment .content>.header:before{border-right-color:#d3d3d4;border-width:9px;margin-top:-9px}
.repository.view.issue .comment-list .comment .content>.header:after{border-right-color:#f7f7f7;border-width:8px;margin-top:-8px}
.repository.view.issue .comment-list .comment .content>.header .text{max-width:78%;padding-top:10px;padding-bottom:10px}
+.repository.view.issue .comment-list .comment .content>.merge-section{border-top:1px solid #d4d4d5;background-color:#f7f7f7}
.repository.view.issue .comment-list .comment .content .markdown{font-size:14px}
.repository.view.issue .comment-list .comment .content .no-content{color:#767676;font-style:italic}
.repository.view.issue .comment-list .comment .content>.bottom.segment{background:#f3f4f5}
diff --git a/public/css/theme-arc-green.css b/public/css/theme-arc-green.css
index e94b150cdc..a93404cad0 100644
--- a/public/css/theme-arc-green.css
+++ b/public/css/theme-arc-green.css
@@ -111,6 +111,7 @@ footer{background:#2e323e;border-top:1px solid #313131}
.ui.attached.segment{border:1px solid #404552}
.repository.view.issue .comment-list .comment .content>.bottom.segment{background:#353945}
.repository.view.issue .comment-list .comment .content .header{color:#dbdbdb;background-color:#404552;border-bottom:1px solid #353944}
+.repository.view.issue .comment-list .comment .content .merge-section{background-color:#404552;border-top:1px solid #353944}
.ui .text.grey a{color:#dbdbdb!important}
.ui.comments .comment .actions a{color:#dbdbdb}
.repository.view.issue .comment-list .comment .content .header:after{border-right-color:#404552}
diff --git a/public/less/_repository.less b/public/less/_repository.less
index a8b2e22569..5a57f5db71 100644
--- a/public/less/_repository.less
+++ b/public/less/_repository.less
@@ -813,6 +813,11 @@
}
}
+ > .merge-section {
+ border-top: 1px solid #d4d4d5;
+ background-color: #f7f7f7;
+ }
+
.markdown {
font-size: 14px;
}
diff --git a/public/less/themes/arc-green.less b/public/less/themes/arc-green.less
index 4fd98280ef..4780756bce 100644
--- a/public/less/themes/arc-green.less
+++ b/public/less/themes/arc-green.less
@@ -590,6 +590,11 @@ a.ui.basic.green.label:hover {
border-bottom: 1px solid #353944;
}
+.repository.view.issue .comment-list .comment .content .merge-section {
+ background-color: #404552;
+ border-top: 1px solid #353944;
+}
+
.ui .text.grey a {
color: #dbdbdb !important;
}