Skip to content

Commit 819901b

Browse files
ivanvczeripath
andauthored
Update outdated label to use Fomantic UI style (#13181)
* Update outdated label to use Fomantic UI style * Use native labels rather than custom style * Remove leading zero Co-authored-by: zeripath <[email protected]>
1 parent 327f18c commit 819901b

File tree

5 files changed

+16
-38
lines changed

5 files changed

+16
-38
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: 3 additions & 3 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}}
@@ -460,7 +460,7 @@
460460
{{end}}
461461
<a href="{{(index $comms 0).CodeCommentURL}}" class="file-comment">{{$filename}}</a>
462462
{{if $invalid }}
463-
<span class="tag">
463+
<span class="ui label basic small yellow">
464464
{{$.i18n.Tr "repo.issues.review.outdated"}}
465465
</span>
466466
{{end}}

web_src/less/_repository.less

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -953,22 +953,6 @@
953953

954954
.comment {
955955

956-
.tag {
957-
color: #767676;
958-
margin-top: 3px;
959-
padding: 2px 5px;
960-
font-size: 12px;
961-
border: 1px solid rgba(0, 0, 0, .1);
962-
border-radius: 3px;
963-
&.review {
964-
margin-left: 5px;
965-
&.pending {
966-
color: black;
967-
background-color: #fffbb2;
968-
}
969-
}
970-
}
971-
972956
.actions {
973957
.item {
974958
float: left;
@@ -1005,7 +989,7 @@
1005989
> .header {
1006990
#avatar-arrow;
1007991
font-weight: normal;
1008-
padding: auto 15px;
992+
padding: .5rem 1rem;
1009993
position: relative;
1010994
color: #767676;
1011995
background-color: #f7f7f7;
@@ -1032,6 +1016,10 @@
10321016
display: flex;
10331017
padding: 0 .5rem;
10341018

1019+
&.right {
1020+
margin: 0;
1021+
}
1022+
10351023
a {
10361024
color: rgba(0, 0, 0, .4);
10371025

@@ -1226,16 +1214,10 @@
12261214
.hide-outdated {
12271215
display: block;
12281216
}
1229-
}
12301217

1231-
.tag {
1232-
color: black;
1233-
margin: 3px 0 0 5px;
1234-
padding: 2px 5px;
1235-
font-size: 12px;
1236-
border: 1px solid rgba(0, 0, 0, .1);
1237-
border-radius: 3px;
1238-
background-color: #fffbb2;
1218+
.label {
1219+
margin-left: 6px;
1220+
}
12391221
}
12401222
}
12411223
}

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: #2a2e39;
621+
border-color: rgb(152, 152, 152);
622+
background-color: #2a2e39 !important;
622623
}
623624

624625
.issue.list > .item .title {
@@ -1121,11 +1122,6 @@ a.ui.basic.green.label:hover {
11211122
color: #9e9e9e;
11221123
}
11231124

1124-
.repository.view.issue .comment-list .comment .tag {
1125-
color: #dbdbdb;
1126-
border-color: rgb(152, 152, 152);
1127-
}
1128-
11291125
.repository.view.issue .comment-list .timeline-item .badge.badge-commit {
11301126
background: radial-gradient(#383c4a 40%, transparent 40%) no-repeat;
11311127
}

0 commit comments

Comments
 (0)