Skip to content

The Unified and Autonomous Development Platform

Transparent review status icon overlay on reviewer

Robin Shen337b7cacaffd
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.java
index 23fe706323..d20ed0db9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/ReviewStatusIcon.java
@@ -59,11 +59,11 @@ public abstract class ReviewStatusIcon extends WebComponent {
@Override
public String getObject() {
if (getResult() == null)
- return "review-status fa fa-clock-o pending";
+ return "review-status pending";
else if (getResult().isApproved())
- return "review-status fa fa-check-circle approved";
+ return "review-status approved";
else
- return "review-status fa fa-hand-stop-o requested-for-changes";
+ return "review-status requested-for-changes";
}
}));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/accept.png b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/accept.png
new file mode 100644
index 0000000000..719e39151b
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/accept.png differ
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/hand.png b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/hand.png
new file mode 100644
index 0000000000..dc79299d5c
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/hand.png differ
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
index 42efe86a52..b974a8ac9f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/review.css
@@ -25,14 +25,21 @@ table.reviews>tbody>tr>td.actions {
table.reviews>tbody>tr>td.status span {
cursor: default;
}
+.review-status {
+ width: 16px;
+ height: 24px;
+ display: inline-block;
+ background-position: center;
+ background-repeat: no-repeat no-repeat;
+}
.review-status.pending {
- color: #DCB412;
+ background-image: url("time.png");
}
.review-status.approved {
- color: #35A612;
+ background-image: url("accept.png");
}
.review-status.requested-for-changes {
- color: #F93333;
+ background-image: url("hand.png");
}
.review-detail {
padding: 8px;
@@ -50,9 +57,10 @@ table.reviews>tbody>tr>td.status span {
position: relative;
}
.reviewer-avatar>i {
- font-size: 11px;
+ width: 12px;
+ height: 12px;
position: absolute;
- right: 0;
+ right: -2px;
bottom: 0;
- background: white;
+ background-size: 12px;
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/time.png b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/time.png
new file mode 100644
index 0000000000..f69c02d138
Binary files /dev/null and b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/review/time.png differ