Skip to content

Commit e610b03

Browse files
GiteaBotwxiaoguang
GiteaBot
and
wxiaoguang
authored
Fix UI misalignment on user setting page (#25629) (#25656)
Backport #25629 by @wxiaoguang Fix #25628 Diff with ignoring space: https://github.com/go-gitea/gitea/pull/25629/files?diff=unified&w=1 The "modal" shouldn't appear between "ui attached segment", otherwise these segments lose margin-top. After the fix: <details> ![image](https://github.com/go-gitea/gitea/assets/2114189/ac15e73d-4ca8-416a-950d-ffc912c6ab61) ![image](https://github.com/go-gitea/gitea/assets/2114189/eb431336-4d21-4e44-8beb-8919595a83c8) ![image](https://github.com/go-gitea/gitea/assets/2114189/dffaed88-5ba2-419d-a241-24cb200f757c) ![image](https://github.com/go-gitea/gitea/assets/2114189/e8c5a03e-e16a-4c94-a1a5-7845d4e1a824) </details> Co-authored-by: wxiaoguang <[email protected]>
1 parent 13ffa28 commit e610b03

File tree

8 files changed

+73
-83
lines changed

8 files changed

+73
-83
lines changed

‎templates/user/settings/account.tmpl‎

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -39,32 +39,26 @@
3939
{{.locale.Tr "settings.manage_emails"}}
4040
</h4>
4141
<div class="ui attached segment">
42-
<div class="ui email list">
42+
<div class="ui list">
4343
{{if $.EnableNotifyMail}}
4444
<div class="item">
45+
<div class="gt-mb-3">{{.locale.Tr "settings.email_desc"}}</div>
4546
<form action="{{AppSubUrl}}/user/settings/account/email" class="ui form" method="post">
46-
{{.locale.Tr "settings.email_desc"}}
47-
<div class="right floated content">
48-
<div class="field">
49-
<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
50-
</div>
51-
</div>
52-
<div class="right floated content">
53-
{{$.CsrfTokenHtml}}
54-
<input name="_method" type="hidden" value="NOTIFICATION">
55-
<div class="field">
56-
<div class="ui selection dropdown" tabindex="0">
57-
<input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}">
58-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
59-
<div class="text"></div>
60-
<div class="menu">
61-
<div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
62-
<div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
63-
<div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
64-
<div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
65-
</div>
47+
{{$.CsrfTokenHtml}}
48+
<input name="_method" type="hidden" value="NOTIFICATION">
49+
<div class="gt-df gt-fw gt-gap-3">
50+
<div class="ui selection dropdown">
51+
<input name="preference" type="hidden" value="{{.EmailNotificationsPreference}}">
52+
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
53+
<div class="text"></div>
54+
<div class="menu">
55+
<div data-value="enabled" class="{{if eq .EmailNotificationsPreference "enabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.enable"}}</div>
56+
<div data-value="andyourown" class="{{if eq .EmailNotificationsPreference "andyourown"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.andyourown"}}</div>
57+
<div data-value="onmention" class="{{if eq .EmailNotificationsPreference "onmention"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.onmention"}}</div>
58+
<div data-value="disabled" class="{{if eq .EmailNotificationsPreference "disabled"}}active selected {{end}}item">{{$.locale.Tr "settings.email_notifications.disable"}}</div>
6659
</div>
6760
</div>
61+
<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
6862
</div>
6963
</form>
7064
</div>
@@ -102,7 +96,7 @@
10296
</form>
10397
</div>
10498
{{end}}
105-
<div class="content">
99+
<div class="content gt-py-3">
106100
<strong>{{.Email}}</strong>
107101
{{if .IsPrimary}}
108102
<div class="ui primary label">{{$.locale.Tr "settings.primary"}}</div>

‎templates/user/settings/applications_oauth2_list.tmpl‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,19 @@
2222
</div>
2323
{{end}}
2424
</div>
25+
26+
<div class="ui g-modal-confirm delete modal" id="remove-gitea-oauth2-application">
27+
<div class="header">
28+
{{svg "octicon-trash"}}
29+
{{.locale.Tr "settings.remove_oauth2_application"}}
30+
</div>
31+
<div class="content">
32+
<p>{{.locale.Tr "settings.oauth2_application_remove_description"}}</p>
33+
</div>
34+
{{template "base/modal_actions_confirm" .}}
35+
</div>
2536
</div>
37+
2638
<div class="ui attached bottom segment">
2739
<h5 class="ui top header">
2840
{{.locale.Tr "settings.create_oauth2_application"}}
@@ -46,14 +58,3 @@
4658
</button>
4759
</form>
4860
</div>
49-
50-
<div class="ui g-modal-confirm delete modal" id="remove-gitea-oauth2-application">
51-
<div class="header">
52-
{{svg "octicon-trash"}}
53-
{{.locale.Tr "settings.remove_oauth2_application"}}
54-
</div>
55-
<div class="content">
56-
<p>{{.locale.Tr "settings.oauth2_application_remove_description"}}</p>
57-
</div>
58-
{{template "base/modal_actions_confirm" .}}
59-
</div>

‎templates/user/settings/grants_oauth2.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@
2626
</div>
2727
{{end}}
2828
</div>
29-
</div>
3029

31-
<div class="ui g-modal-confirm delete modal" id="revoke-gitea-oauth2-grant">
32-
<div class="header">
33-
{{svg "octicon-shield" 16 "gt-mr-2"}}
34-
{{.locale.Tr "settings.revoke_oauth2_grant"}}
35-
</div>
36-
<div class="content">
37-
<p>{{.locale.Tr "settings.revoke_oauth2_grant_description"}}</p>
30+
<div class="ui g-modal-confirm delete modal" id="revoke-gitea-oauth2-grant">
31+
<div class="header">
32+
{{svg "octicon-shield" 16 "gt-mr-2"}}
33+
{{.locale.Tr "settings.revoke_oauth2_grant"}}
34+
</div>
35+
<div class="content">
36+
<p>{{.locale.Tr "settings.revoke_oauth2_grant_description"}}</p>
37+
</div>
38+
{{template "base/modal_actions_confirm" .}}
3839
</div>
39-
{{template "base/modal_actions_confirm" .}}
4040
</div>

‎templates/user/settings/security/accountlinks.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@
3939
{{end}}
4040
{{end}}
4141
</div>
42-
</div>
4342

44-
<div class="ui g-modal-confirm delete modal" id="delete-account-link">
45-
<div class="header">
46-
{{svg "octicon-trash"}}
47-
{{.locale.Tr "settings.remove_account_link"}}
48-
</div>
49-
<div class="content">
50-
<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
43+
<div class="ui g-modal-confirm delete modal" id="delete-account-link">
44+
<div class="header">
45+
{{svg "octicon-trash"}}
46+
{{.locale.Tr "settings.remove_account_link"}}
47+
</div>
48+
<div class="content">
49+
<p>{{.locale.Tr "settings.remove_account_link_desc"}}</p>
50+
</div>
51+
{{template "base/modal_actions_confirm" .}}
5152
</div>
52-
{{template "base/modal_actions_confirm" .}}
5353
</div>

‎templates/user/settings/security/openid.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
{{.locale.Tr "settings.add_openid"}}
5050
</button>
5151
</form>
52-
</div>
5352

54-
<div class="ui g-modal-confirm delete modal" id="delete-openid">
55-
<div class="header">
56-
{{svg "octicon-trash"}}
57-
{{.locale.Tr "settings.openid_deletion"}}
58-
</div>
59-
<div class="content">
60-
<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
53+
<div class="ui g-modal-confirm delete modal" id="delete-openid">
54+
<div class="header">
55+
{{svg "octicon-trash"}}
56+
{{.locale.Tr "settings.openid_deletion"}}
57+
</div>
58+
<div class="content">
59+
<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
60+
</div>
61+
{{template "base/modal_actions_confirm" .}}
6162
</div>
62-
{{template "base/modal_actions_confirm" .}}
6363
</div>

‎templates/user/settings/security/twofa.tmpl‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@
2121
<a class="ui green button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a>
2222
</div>
2323
{{end}}
24-
</div>
2524

26-
<div class="ui g-modal-confirm delete modal" id="disable-twofa">
27-
<div class="header">
28-
{{svg "octicon-trash"}}
29-
{{.locale.Tr "settings.twofa_disable"}}
30-
</div>
31-
<div class="content">
32-
<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
25+
<div class="ui g-modal-confirm delete modal" id="disable-twofa">
26+
<div class="header">
27+
{{svg "octicon-trash"}}
28+
{{.locale.Tr "settings.twofa_disable"}}
29+
</div>
30+
<div class="content">
31+
<p>{{.locale.Tr "settings.twofa_disable_desc"}}</p>
32+
</div>
33+
{{template "base/modal_actions_confirm" .}}
3334
</div>
34-
{{template "base/modal_actions_confirm" .}}
3535
</div>

‎templates/user/settings/security/webauthn.tmpl‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424
</div>
2525
<button id="register-webauthn" class="ui green button">{{svg "octicon-key"}} {{.locale.Tr "settings.webauthn_register_key"}}</button>
2626
</div>
27-
</div>
28-
29-
<div class="ui g-modal-confirm delete modal" id="delete-registration">
30-
<div class="header">
31-
{{svg "octicon-trash"}}
32-
{{.locale.Tr "settings.webauthn_delete_key"}}
33-
</div>
34-
<div class="content">
35-
<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
27+
<div class="ui g-modal-confirm delete modal" id="delete-registration">
28+
<div class="header">
29+
{{svg "octicon-trash"}}
30+
{{.locale.Tr "settings.webauthn_delete_key"}}
31+
</div>
32+
<div class="content">
33+
<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
34+
</div>
35+
{{template "base/modal_actions_confirm" .}}
3636
</div>
37-
{{template "base/modal_actions_confirm" .}}
3837
</div>

‎web_src/css/repo.css‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2365,10 +2365,6 @@
23652365
color: var(--color-text-light-2);
23662366
}
23672367

2368-
.settings .list.email > .item:not(:first-child) {
2369-
min-height: 60px;
2370-
}
2371-
23722368
.settings .list.collaborator > .item {
23732369
padding: 0;
23742370
}

0 commit comments

Comments
 (0)