From 88ae664bea18249c1473c254fb045f7381ec5fe2 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Fri, 25 Oct 2019 11:48:36 -0300 Subject: [PATCH 1/3] Improve visibility of "Pending" indicator --- public/css/index.css | 1 + public/less/_repository.less | 5 +++++ templates/repo/diff/comments.tmpl | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/public/css/index.css b/public/css/index.css index e404c1fec636f..5f3522e58bd65 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -567,6 +567,7 @@ i.icon.centerlock{top:1.5em} .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 .tag.pending{color:#000;background:#fff866;margin-left:5px} .repository.view.issue .comment-list .comment .actions .item{float:left} .repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px} .repository.view.issue .comment-list .comment .actions .item.action{margin-top:6px;margin-left:10px} diff --git a/public/less/_repository.less b/public/less/_repository.less index 48a1214c076be..4beb450add9a9 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -738,6 +738,11 @@ font-size: 12px; border: 1px solid rgba(0, 0, 0, 0.1); border-radius: 3px; + &.pending { + color: black; + background: #fff866; + margin-left: 5px; + } } .actions { diff --git a/templates/repo/diff/comments.tmpl b/templates/repo/diff/comments.tmpl index 1288886a61dad..85c84c6bac4a2 100644 --- a/templates/repo/diff/comments.tmpl +++ b/templates/repo/diff/comments.tmpl @@ -11,7 +11,7 @@
{{if and .Review}} {{if eq .Review.Type 0}} -
+
{{$.root.i18n.Tr "repo.issues.review.pending"}}
{{else}} From a75fd0b2c0e4d1c96e333abd7af192b2e5be9fae Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Fri, 25 Oct 2019 12:00:32 -0300 Subject: [PATCH 2/3] Use background-color instead of just background --- public/css/index.css | 2 +- public/less/_repository.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 5f3522e58bd65..55c4abf2a585f 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -567,7 +567,7 @@ i.icon.centerlock{top:1.5em} .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 .tag.pending{color:#000;background:#fff866;margin-left:5px} +.repository.view.issue .comment-list .comment .tag.pending{color:#000;background-color:#fff866;margin-left:5px} .repository.view.issue .comment-list .comment .actions .item{float:left} .repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px} .repository.view.issue .comment-list .comment .actions .item.action{margin-top:6px;margin-left:10px} diff --git a/public/less/_repository.less b/public/less/_repository.less index 4beb450add9a9..ce9dab6056782 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -740,7 +740,7 @@ border-radius: 3px; &.pending { color: black; - background: #fff866; + background-color: #fff866; margin-left: 5px; } } From 89d1d65b8acc280d58ddf02b7ea797e6b9bb01c2 Mon Sep 17 00:00:00 2001 From: Guillermo Prandi Date: Fri, 25 Oct 2019 19:36:49 -0300 Subject: [PATCH 3/3] Tone down the yellow --- public/css/index.css | 2 +- public/less/_repository.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/css/index.css b/public/css/index.css index 55c4abf2a585f..2815accab9d41 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -567,7 +567,7 @@ i.icon.centerlock{top:1.5em} .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 .tag.pending{color:#000;background-color:#fff866;margin-left:5px} +.repository.view.issue .comment-list .comment .tag.pending{color:#000;background-color:#fffbb2;margin-left:5px} .repository.view.issue .comment-list .comment .actions .item{float:left} .repository.view.issue .comment-list .comment .actions .item.tag{margin-right:5px} .repository.view.issue .comment-list .comment .actions .item.action{margin-top:6px;margin-left:10px} diff --git a/public/less/_repository.less b/public/less/_repository.less index ce9dab6056782..d6bc84ee56ae8 100644 --- a/public/less/_repository.less +++ b/public/less/_repository.less @@ -740,7 +740,7 @@ border-radius: 3px; &.pending { color: black; - background-color: #fff866; + background-color: #fffbb2; margin-left: 5px; } }