Skip to content

Commit 1fe4db0

Browse files
committed
Use native labels rather than custom style
1 parent 65328d9 commit 1fe4db0

File tree

5 files changed

+13
-29
lines changed

5 files changed

+13
-29
lines changed

templates/repo/diff/comments.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
<div class="ui right actions">
2222
{{if and .Review}}
2323
{{if eq .Review.Type 0}}
24-
<div class="item tag review pending">
24+
<div class="ui label basic small yellow">
2525
{{$.root.i18n.Tr "repo.issues.review.pending"}}
2626
</div>
2727
{{else}}
28-
<div class="item tag review">
28+
<div class="ui label basic small">
2929
{{$.root.i18n.Tr "repo.issues.review.review"}}
3030
</div>
3131
{{end}}

templates/repo/issue/view_content.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
{{if not $.Repository.IsArchived}}
4242
<div class="ui right actions">
4343
{{if gt .Issue.ShowTag 0}}
44-
<div class="item tag">
44+
<div class="ui basic label">
4545
{{if eq .Issue.ShowTag 2}}
4646
{{$.i18n.Tr "repo.issues.collaborator"}}
4747
{{else if eq .Issue.ShowTag 3}}

templates/repo/issue/view_content/comments.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
{{if not $.Repository.IsArchived}}
2929
<div class="ui right actions">
3030
{{if eq .PosterID .Issue.PosterID }}
31-
<div class="item tag">
31+
<div class="ui basic label">
3232
{{$.i18n.Tr "repo.issues.poster"}}
3333
</div>
3434
{{end}}
3535
{{if gt .ShowTag 0}}
36-
<div class="item tag">
36+
<div class="ui basic label">
3737
{{if eq .ShowTag 2}}
3838
{{$.i18n.Tr "repo.issues.collaborator"}}
3939
{{else if eq .ShowTag 3}}

web_src/less/_repository.less

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -946,22 +946,6 @@
946946

947947
.comment {
948948

949-
.tag {
950-
color: #767676;
951-
margin-top: 3px;
952-
padding: 2px 5px;
953-
font-size: 12px;
954-
border: 1px solid rgba(0, 0, 0, .1);
955-
border-radius: 3px;
956-
&.review {
957-
margin-left: 5px;
958-
&.pending {
959-
color: black;
960-
background-color: #fffbb2;
961-
}
962-
}
963-
}
964-
965949
.actions {
966950
.item {
967951
float: left;
@@ -998,7 +982,7 @@
998982
> .header {
999983
#avatar-arrow;
1000984
font-weight: normal;
1001-
padding: auto 15px;
985+
padding: 0.5rem 1rem;
1002986
position: relative;
1003987
color: #767676;
1004988
background-color: #f7f7f7;
@@ -1025,6 +1009,10 @@
10251009
display: flex;
10261010
padding: 0 .5rem;
10271011

1012+
&.right {
1013+
margin: 0;
1014+
}
1015+
10281016
a {
10291017
color: rgba(0, 0, 0, .4);
10301018

@@ -1221,7 +1209,7 @@
12211209
}
12221210

12231211
.label {
1224-
margin-left: 5px;
1212+
margin-left: 6px;
12251213
}
12261214
}
12271215
}

web_src/less/themes/theme-arc-green.less

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,8 @@ footer {
618618
.ui.label,
619619
.ui.label.basic {
620620
color: #dbdbdb;
621-
background-color: #404552;
621+
border-color: rgb(152, 152, 152);
622+
background-color: #404552 !important;
622623
}
623624

624625
.issue.list > .item .title {
@@ -1033,11 +1034,6 @@ a.ui.basic.green.label:hover {
10331034
color: #9e9e9e;
10341035
}
10351036

1036-
.repository.view.issue .comment-list .comment .tag {
1037-
color: #dbdbdb;
1038-
border-color: rgb(152, 152, 152);
1039-
}
1040-
10411037
.repository.view.issue .comment-list .timeline-item .badge.badge-commit {
10421038
background: radial-gradient(#383c4a 40%, transparent 40%) no-repeat;
10431039
}

0 commit comments

Comments
 (0)