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.

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

Fix webhook list styling #14001

Merged
merged 4 commits into from
Dec 16, 2020
Merged

Fix webhook list styling #14001

merged 4 commits into from
Dec 16, 2020

Conversation

CirnoT
Copy link
Contributor

@CirnoT CirnoT commented Dec 15, 2020

#13860 tried to fix webhook list styling on admin dashboard, but in turn it broke for repository settings.

Before:
chrome_2020-12-15_20-57-31
chrome_2020-12-15_20-56-58

After:
chrome_2020-12-15_20-56-37
chrome_2020-12-15_21-07-23

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Dec 15, 2020
@zeripath zeripath added the topic/ui Change the appearance of the Gitea UI label Dec 15, 2020
@zeripath zeripath added this to the 1.14.0 milestone Dec 15, 2020
@silverwind
Copy link
Member

silverwind commented Dec 15, 2020

Small patch to pull in to fix margin on the red/yellow icons:

diff --git a/templates/repo/settings/webhook/list.tmpl b/templates/repo/settings/webhook/list.tmpl
index f39f632a9..02a3bcad6 100644
--- a/templates/repo/settings/webhook/list.tmpl
+++ b/templates/repo/settings/webhook/list.tmpl
@@ -43,11 +43,11 @@
 		</div>
 		{{range .Webhooks}}
 			<div class="item">
 				{{if eq .LastStatus 1}}
-					<span class="text green">{{svg "octicon-check"}}</span>
+					<span class="text green mr-3">{{svg "octicon-check"}}</span>
 				{{else if eq .LastStatus 2}}
-					<span class="text red">{{svg "octicon-alert"}}</span>
+					<span class="text red mr-3">{{svg "octicon-alert"}}</span>
 				{{else}}
 					<span class="text grey mr-3">{{svg "octicon-dot-fill"}}</span>
 				{{end}}
 				<a class="dont-break-out" href="{{$.BaseLink}}/{{.ID}}">{{.URL}}</a>

Before:

image

After:

image

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Dec 15, 2020
@@ -1,4 +1,14 @@
.admin {
&.hooks .list {
> .item {
&:not(:first-child) {
Copy link
Member

@silverwind silverwind Dec 15, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also .item + .item for a more robust selector.

@codecov-io
Copy link

codecov-io commented Dec 16, 2020

Codecov Report

Merging #14001 (127ea20) into master (66379ba) will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #14001      +/-   ##
==========================================
+ Coverage   42.20%   42.22%   +0.02%     
==========================================
  Files         710      710              
  Lines       77273    77281       +8     
==========================================
+ Hits        32612    32632      +20     
+ Misses      39288    39278      -10     
+ Partials     5373     5371       -2     
Impacted Files Coverage Δ
services/release/release.go 48.59% <100.00%> (+4.15%) ⬆️
modules/indexer/stats/queue.go 52.94% <0.00%> (-23.53%) ⬇️
modules/indexer/stats/db.go 43.47% <0.00%> (-8.70%) ⬇️
modules/queue/unique_queue_channel.go 58.06% <0.00%> (-6.46%) ⬇️
models/unit.go 46.57% <0.00%> (-2.74%) ⬇️
routers/repo/view.go 37.47% <0.00%> (-0.65%) ⬇️
services/pull/pull.go 40.68% <0.00%> (-0.50%) ⬇️
models/error.go 38.98% <0.00%> (ø)
models/issue_comment.go 52.87% <0.00%> (+0.15%) ⬆️
modules/git/repo.go 46.23% <0.00%> (+0.50%) ⬆️
... and 8 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 53308de...127ea20. Read the comment docs.

@6543 6543 merged commit 5f55bab into go-gitea:master Dec 16, 2020
@CirnoT CirnoT deleted the webhook-list branch December 16, 2020 22:31
@go-gitea go-gitea locked and limited conversation to collaborators Jan 18, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. topic/ui Change the appearance of the Gitea UI
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants