Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update outdated label to use Fomantic UI style (#13181)

Browse source 
* Update outdated label to use Fomantic UI style

* Use native labels rather than custom style

* Remove leading zero

Co-authored-by: zeripath <art27@cantab.net>
This commit is contained in:
Iván Valdés 2020-10-21 16:47:16 -07:00 committed by GitHub
parent 327f18c3b2
commit 819901b3e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
templates/repo/diff/comments.tmpl
View file

@ -21,11 +21,11 @@
<div class="ui right actions"> <div class="ui right actions">
{{if and .Review}} {{if and .Review}}
{{if eq .Review.Type 0}} {{if eq .Review.Type 0}}
<div class="item tag review pending"> <div class="ui label basic small yellow">
{{$.root.i18n.Tr "repo.issues.review.pending"}} {{$.root.i18n.Tr "repo.issues.review.pending"}}
</div> </div>
{{else}} {{else}}
<div class="item tag review"> <div class="ui label basic small">
{{$.root.i18n.Tr "repo.issues.review.review"}} {{$.root.i18n.Tr "repo.issues.review.review"}}
</div> </div>
{{end}} {{end}}

2
templates/repo/issue/view_content.tmpl
View file

@ -41,7 +41,7 @@
{{if not $.Repository.IsArchived}} {{if not $.Repository.IsArchived}}
<div class="ui right actions"> <div class="ui right actions">
{{if gt .Issue.ShowTag 0}} {{if gt .Issue.ShowTag 0}}
<div class="item tag"> <div class="ui basic label">
{{if eq .Issue.ShowTag 2}} {{if eq .Issue.ShowTag 2}}
{{$.i18n.Tr "repo.issues.collaborator"}} {{$.i18n.Tr "repo.issues.collaborator"}}
{{else if eq .Issue.ShowTag 3}} {{else if eq .Issue.ShowTag 3}}

6
templates/repo/issue/view_content/comments.tmpl
View file

@ -28,12 +28,12 @@
{{if not $.Repository.IsArchived}} {{if not $.Repository.IsArchived}}
<div class="ui right actions"> <div class="ui right actions">
{{if eq .PosterID .Issue.PosterID }} {{if eq .PosterID .Issue.PosterID }}
<div class="item tag"> <div class="ui basic label">
{{$.i18n.Tr "repo.issues.poster"}} {{$.i18n.Tr "repo.issues.poster"}}
</div> </div>
{{end}} {{end}}
{{if gt .ShowTag 0}} {{if gt .ShowTag 0}}
<div class="item tag"> <div class="ui basic label">
{{if eq .ShowTag 2}} {{if eq .ShowTag 2}}
{{$.i18n.Tr "repo.issues.collaborator"}} {{$.i18n.Tr "repo.issues.collaborator"}}
{{else if eq .ShowTag 3}} {{else if eq .ShowTag 3}}
@ -460,7 +460,7 @@
{{end}} {{end}}
<a href="{{(index $comms 0).CodeCommentURL}}" class="file-comment">{{$filename}}</a> <a href="{{(index $comms 0).CodeCommentURL}}" class="file-comment">{{$filename}}</a>
{{if $invalid }} {{if $invalid }}
<span class="tag"> <span class="ui label basic small yellow">
{{$.i18n.Tr "repo.issues.review.outdated"}} {{$.i18n.Tr "repo.issues.review.outdated"}}
</span> </span>
{{end}} {{end}}

34
web_src/less/_repository.less
View file

@ -953,22 +953,6 @@
.comment { .comment {
.tag {
color: #767676;
margin-top: 3px;
padding: 2px 5px;
font-size: 12px;
border: 1px solid rgba(0, 0, 0, .1);
border-radius: 3px;
&.review {
margin-left: 5px;
&.pending {
color: black;
background-color: #fffbb2;
}
}
}
.actions { .actions {
.item { .item {
float: left; float: left;
@ -1005,7 +989,7 @@
> .header { > .header {
#avatar-arrow; #avatar-arrow;
font-weight: normal; font-weight: normal;
padding: auto 15px; padding: .5rem 1rem;
position: relative; position: relative;
color: #767676; color: #767676;
background-color: #f7f7f7; background-color: #f7f7f7;
@ -1032,6 +1016,10 @@
display: flex; display: flex;
padding: 0 .5rem; padding: 0 .5rem;
&.right {
margin: 0;
}
a { a {
color: rgba(0, 0, 0, .4); color: rgba(0, 0, 0, .4);
@ -1226,16 +1214,10 @@
.hide-outdated { .hide-outdated {
display: block; display: block;
} }
}
.tag { .label {
color: black; margin-left: 6px;
margin: 3px 0 0 5px; }
padding: 2px 5px;
font-size: 12px;
border: 1px solid rgba(0, 0, 0, .1);
border-radius: 3px;
background-color: #fffbb2;
} }
} }
} }

8
web_src/less/themes/theme-arc-green.less
View file

@ -618,7 +618,8 @@ footer {
.ui.label, .ui.label,
.ui.label.basic { .ui.label.basic {
color: #dbdbdb; color: #dbdbdb;
background-color: #2a2e39; border-color: rgb(152, 152, 152);
background-color: #2a2e39 !important;
} }
.issue.list > .item .title { .issue.list > .item .title {
@ -1121,11 +1122,6 @@ a.ui.basic.green.label:hover {
color: #9e9e9e; color: #9e9e9e;
} }
.repository.view.issue .comment-list .comment .tag {
color: #dbdbdb;
border-color: rgb(152, 152, 152);
}
.repository.view.issue .comment-list .timeline-item .badge.badge-commit { .repository.view.issue .comment-list .timeline-item .badge.badge-commit {
background: radial-gradient(#383c4a 40%, transparent 40%) no-repeat; background: radial-gradient(#383c4a 40%, transparent 40%) no-repeat;
} }