Skip to content

Commit d00085e

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 2715ef6 commit d00085e

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎templates/repo/settings/deploy_keys.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
{{.locale.Tr "repo.settings.deploy_keys"}}
55
<div class="ui right">
66
{{if not .DisableSSH}}
7-
<button class="ui primary tiny show-panel button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
7+
<button class="ui primary tiny show-panel toggle button" data-panel="#add-deploy-key-panel">{{.locale.Tr "repo.settings.add_deploy_key"}}</button>
88
{{else}}
99
<button class="ui primary tiny button disabled">{{.locale.Tr "settings.ssh_disabled"}}</button>
1010
{{end}}
1111
</div>
1212
</h4>
1313
<div class="ui attached segment">
14-
<div class="{{if not .HasError}}gt-hidden{{end}}" id="add-deploy-key-panel">
14+
<div class="{{if not .HasError}}gt-hidden{{end}} gt-mb-4" id="add-deploy-key-panel">
1515
<form class="ui form" action="{{.Link}}" method="post">
1616
{{.CsrfTokenHtml}}
1717
<div class="field">

‎templates/user/settings/keys_gpg.tmpl

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<h4 class="ui top attached header">
22
{{.locale.Tr "settings.manage_gpg_keys"}}
33
<div class="ui right">
4-
<button class="ui primary tiny show-panel button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</button>
4+
<button class="ui primary tiny show-panel toggle button" data-panel="#add-gpg-key-panel">{{.locale.Tr "settings.add_key"}}</button>
55
</div>
66
</h4>
77
<div class="ui attached segment">
8-
<div class="{{if not .HasGPGError}}gt-hidden{{end}}" id="add-gpg-key-panel">
8+
<div class="{{if not .HasGPGError}}gt-hidden{{end}} gt-mb-4" id="add-gpg-key-panel">
99
<form class="ui form{{if .HasGPGError}} error{{end}}" action="{{.Link}}" method="post">
1010
{{.CsrfTokenHtml}}
1111
<input type="hidden" name="title" value="none">
@@ -41,7 +41,10 @@
4141
</div>
4242
<div class="flex-list">
4343
<div class="flex-item">
44-
{{.locale.Tr "settings.gpg_desc"}}
44+
<p>
45+
{{.locale.Tr "settings.gpg_desc"}}<br>
46+
{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}
47+
</p>
4548
</div>
4649
{{range .GPGKeys}}
4750
<div class="flex-item">
@@ -107,17 +110,14 @@
107110
{{end}}
108111
{{end}}
109112
</div>
110-
</div>
111-
<br>
112-
<p>{{.locale.Tr "settings.gpg_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/about-commit-signature-verification#gpg-commit-signature-verification" | Str2html}}</p>
113-
114-
<div class="ui g-modal-confirm delete modal" id="delete-gpg">
115-
<div class="header">
116-
{{svg "octicon-trash"}}
117-
{{.locale.Tr "settings.gpg_key_deletion"}}
118-
</div>
119-
<div class="content">
120-
<p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
113+
<div class="ui g-modal-confirm delete modal" id="delete-gpg">
114+
<div class="header">
115+
{{svg "octicon-trash"}}
116+
{{.locale.Tr "settings.gpg_key_deletion"}}
117+
</div>
118+
<div class="content">
119+
<p>{{.locale.Tr "settings.gpg_key_deletion_desc"}}</p>
120+
</div>
121+
{{template "base/modal_actions_confirm" .}}
121122
</div>
122-
{{template "base/modal_actions_confirm" .}}
123123
</div>

‎templates/user/settings/keys_ssh.tmpl

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<h4 class="ui top attached header">
22
{{.locale.Tr "settings.manage_ssh_keys"}}
33
<div class="ui right">
4-
<button id="add-ssh-button" class="ui primary tiny show-panel button" data-panel="#add-ssh-key-panel">
4+
<button id="add-ssh-button" class="ui primary tiny show-panel toggle button" data-panel="#add-ssh-key-panel">
55
{{.locale.Tr "settings.add_key"}}
66
</button>
77
</div>
88
</h4>
99
<div class="ui attached segment">
10-
<div class="{{if not .HasSSHError}}gt-hidden{{end}}" id="add-ssh-key-panel">
10+
<div class="{{if not .HasSSHError}}gt-hidden{{end}} gt-mb-4" id="add-ssh-key-panel">
1111
<form class="ui form" action="{{.Link}}" method="post">
1212
{{.CsrfTokenHtml}}
1313
<div class="field {{if .Err_Title}}error{{end}}">
@@ -29,7 +29,10 @@
2929
</div>
3030
<div id="keys-ssh" class="flex-list">
3131
<div class="flex-item">
32-
{{.locale.Tr "settings.ssh_desc"}}
32+
<p>
33+
{{.locale.Tr "settings.ssh_desc"}}<br>
34+
{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}
35+
</p>
3336
</div>
3437
{{if .DisableSSH}}
3538
<div class="flex-item">
@@ -95,17 +98,14 @@
9598
{{end}}
9699
{{end}}
97100
</div>
98-
</div>
99-
<br>
100-
<p>{{.locale.Tr "settings.ssh_helper" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/connecting-to-github-with-ssh" "https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/troubleshooting-ssh" | Str2html}}</p>
101-
102-
<div class="ui g-modal-confirm delete modal" id="delete-ssh">
103-
<div class="header">
104-
{{svg "octicon-trash"}}
105-
{{.locale.Tr "settings.ssh_key_deletion"}}
106-
</div>
107-
<div class="content">
108-
<p>{{.locale.Tr "settings.ssh_key_deletion_desc"}}</p>
101+
<div class="ui g-modal-confirm delete modal" id="delete-ssh">
102+
<div class="header">
103+
{{svg "octicon-trash"}}
104+
{{.locale.Tr "settings.ssh_key_deletion"}}
105+
</div>
106+
<div class="content">
107+
<p>{{.locale.Tr "settings.ssh_key_deletion_desc"}}</p>
108+
</div>
109+
{{template "base/modal_actions_confirm" .}}
109110
</div>
110-
{{template "base/modal_actions_confirm" .}}
111111
</div>

‎web_src/css/shared/flex-list.css

+3-3
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,15 @@
9191
border-top: 1px solid var(--color-secondary);
9292
}
9393

94-
/* Fomantic UI segment has default "padding: 1em", so here it removes the padding-top and padding-bottom accordingly.
94+
/* Fomantic UI segment has default "padding: 1em", so here it removes the padding-top and padding-bottom accordingly (there might also be some `gt-hidden` siblings).
9595
Developers could also use "flex-space-fitted" class to remove the first item's padding-top and the last item's padding-bottom */
9696
.flex-list.flex-space-fitted > .flex-item:first-child,
97-
.ui.segment > .flex-list:first-child > .flex-item:first-child {
97+
.ui.segment > .flex-list > .flex-item:first-child {
9898
padding-top: 0;
9999
}
100100

101101
.flex-list.flex-space-fitted > .flex-item:last-child,
102-
.ui.segment > .flex-list:last-child > .flex-item:last-child {
102+
.ui.segment > .flex-list > .flex-item:last-child {
103103
padding-bottom: 0;
104104
}
105105

0 commit comments

Comments
 (0)