Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update outdated label to use Fomantic UI style #13181

Merged
merged 7 commits into from
Oct 21, 2020
Merged

Update outdated label to use Fomantic UI style #13181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2457949
Update outdated label to use Fomantic UI style
ivanvc Oct 16, 2020
65328d9
Merge remote-tracking branch 'origin/master' into update-outdated-com…
ivanvc Oct 16, 2020
1fe4db0
Use native labels rather than custom style
ivanvc Oct 19, 2020
486a1d3
Remove leading zero
ivanvc Oct 19, 2020
f5c3a69
Merge remote-tracking branch 'origin/master' into update-outdated-com…
ivanvc Oct 21, 2020
8b87d64
Merge branch 'master' into update-outdated-comments-in-pull-request-l…
zeripath Oct 21, 2020
fe711a6
Merge branch 'master' into update-outdated-comments-in-pull-request-l…
techknowlogick Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions templates/repo/diff/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@
<div class="ui right actions">
{{if and .Review}}
{{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"}}
</div>
{{else}}
<div class="item tag review">
<div class="ui label basic small">
{{$.root.i18n.Tr "repo.issues.review.review"}}
</div>
{{end}}
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{{if not $.Repository.IsArchived}}
<div class="ui right actions">
{{if gt .Issue.ShowTag 0}}
<div class="item tag">
<div class="ui basic label">
{{if eq .Issue.ShowTag 2}}
{{$.i18n.Tr "repo.issues.collaborator"}}
{{else if eq .Issue.ShowTag 3}}
Expand Down
6 changes: 3 additions & 3 deletions templates/repo/issue/view_content/comments.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@
{{if not $.Repository.IsArchived}}
<div class="ui right actions">
{{if eq .PosterID .Issue.PosterID }}
<div class="item tag">
<div class="ui basic label">
{{$.i18n.Tr "repo.issues.poster"}}
</div>
{{end}}
{{if gt .ShowTag 0}}
<div class="item tag">
<div class="ui basic label">
{{if eq .ShowTag 2}}
{{$.i18n.Tr "repo.issues.collaborator"}}
{{else if eq .ShowTag 3}}
Expand Down Expand Up @@ -460,7 +460,7 @@
{{end}}
<a href="{{(index $comms 0).CodeCommentURL}}" class="file-comment">{{$filename}}</a>
{{if $invalid }}
<span class="tag">
<span class="ui label basic small yellow">
{{$.i18n.Tr "repo.issues.review.outdated"}}
</span>
{{end}}
Expand Down
34 changes: 8 additions & 26 deletions web_src/less/_repository.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,22 +953,6 @@

.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 {
.item {
float: left;
Expand Down Expand Up @@ -1005,7 +989,7 @@
> .header {
#avatar-arrow;
font-weight: normal;
padding: auto 15px;
padding: .5rem 1rem;
position: relative;
color: #767676;
background-color: #f7f7f7;
Expand All @@ -1032,6 +1016,10 @@
display: flex;
padding: 0 .5rem;

&.right {
margin: 0;
}

a {
color: rgba(0, 0, 0, .4);

Expand Down Expand Up @@ -1226,16 +1214,10 @@
.hide-outdated {
display: block;
}
}

.tag {
color: black;
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;
.label {
margin-left: 6px;
}
}
}
}
Expand Down
8 changes: 2 additions & 6 deletions web_src/less/themes/theme-arc-green.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,8 @@ footer {
.ui.label,
.ui.label.basic {
color: #dbdbdb;
background-color: #2a2e39;
border-color: rgb(152, 152, 152);
background-color: #2a2e39 !important;
}

.issue.list > .item .title {
Expand Down Expand Up @@ -1121,11 +1122,6 @@ a.ui.basic.green.label:hover {
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 {
background: radial-gradient(#383c4a 40%, transparent 40%) no-repeat;
}
Expand Down