loading up the forgejo repo on tangled to test page performance
Fix UI misalignment on user setting page (#25629)
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>
</details>
authored by
wxiaoguang
and committed by
GitHub
eea58a5d
deb007ca
+73
-83
+16
-22
templates/user/settings/account.tmpl
+16
-22
templates/user/settings/account.tmpl
···
39
39
{{.locale.Tr "settings.manage_emails"}}
40
40
</h4>
41
41
<div class="ui attached segment">
42
-
<div class="ui email list">
42
+
<div class="ui list">
43
43
{{if $.EnableNotifyMail}}
44
44
<div class="item">
45
+
<div class="gt-mb-3">{{.locale.Tr "settings.email_desc"}}</div>
45
46
<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>
66
59
</div>
67
60
</div>
61
+
<button class="ui green button">{{$.locale.Tr "settings.email_notifications.submit"}}</button>
68
62
</div>
69
63
</form>
70
64
</div>
···
102
96
</form>
103
97
</div>
104
98
{{end}}
105
-
<div class="content">
99
+
<div class="content gt-py-3">
106
100
<strong>{{.Email}}</strong>
107
101
{{if .IsPrimary}}
108
102
<div class="ui primary label">{{$.locale.Tr "settings.primary"}}</div>
+12
-11
templates/user/settings/applications_oauth2_list.tmpl
+12
-11
templates/user/settings/applications_oauth2_list.tmpl
···
22
22
</div>
23
23
{{end}}
24
24
</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>
25
36
</div>
37
+
26
38
<div class="ui attached bottom segment">
27
39
<h5 class="ui top header">
28
40
{{.locale.Tr "settings.create_oauth2_application"}}
···
46
58
</button>
47
59
</form>
48
60
</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>
+9
-9
templates/user/settings/grants_oauth2.tmpl
+9
-9
templates/user/settings/grants_oauth2.tmpl
···
26
26
</div>
27
27
{{end}}
28
28
</div>
29
-
</div>
30
29
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" .}}
38
39
</div>
39
-
{{template "base/modal_actions_confirm" .}}
40
40
</div>
+9
-9
templates/user/settings/security/accountlinks.tmpl
+9
-9
templates/user/settings/security/accountlinks.tmpl
···
39
39
</div>
40
40
{{end}}
41
41
</div>
42
-
</div>
43
42
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" .}}
51
52
</div>
52
-
{{template "base/modal_actions_confirm" .}}
53
53
</div>
54
54
{{end}}
+9
-9
templates/user/settings/security/openid.tmpl
+9
-9
templates/user/settings/security/openid.tmpl
···
48
48
{{.locale.Tr "settings.add_openid"}}
49
49
</button>
50
50
</form>
51
-
</div>
52
51
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>
52
+
<div class="ui g-modal-confirm delete modal" id="delete-openid">
53
+
<div class="header">
54
+
{{svg "octicon-trash"}}
55
+
{{.locale.Tr "settings.openid_deletion"}}
56
+
</div>
57
+
<div class="content">
58
+
<p>{{.locale.Tr "settings.openid_deletion_desc"}}</p>
59
+
</div>
60
+
{{template "base/modal_actions_confirm" .}}
60
61
</div>
61
-
{{template "base/modal_actions_confirm" .}}
62
62
</div>
+9
-9
templates/user/settings/security/twofa.tmpl
+9
-9
templates/user/settings/security/twofa.tmpl
···
21
21
<a class="ui green button" href="{{AppSubUrl}}/user/settings/security/two_factor/enroll">{{$.locale.Tr "settings.twofa_enroll"}}</a>
22
22
</div>
23
23
{{end}}
24
-
</div>
25
24
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" .}}
33
34
</div>
34
-
{{template "base/modal_actions_confirm" .}}
35
35
</div>
+9
-10
templates/user/settings/security/webauthn.tmpl
+9
-10
templates/user/settings/security/webauthn.tmpl
···
24
24
</div>
25
25
<button id="register-webauthn" class="ui green button">{{svg "octicon-key"}} {{.locale.Tr "settings.webauthn_register_key"}}</button>
26
26
</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"}}
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" .}}
33
36
</div>
34
-
<div class="content">
35
-
<p>{{.locale.Tr "settings.webauthn_delete_key_desc"}}</p>
36
-
</div>
37
-
{{template "base/modal_actions_confirm" .}}
38
37
</div>