diff options
| author | Cirno the Strongest <1447794+CirnoT@users.noreply.github.com> | 2020-05-14 19:59:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 18:59:18 +0100 |
| commit | 5df72ef7e791807600bc318c0282cf1b2e590b27 (patch) | |
| tree | 0512377e3398cc563cc41e40212053cc41b482d2 | |
| parent | 9249c810b883406e649586f6731a820c1c96b698 (diff) | |
| download | gitea-5df72ef7e791807600bc318c0282cf1b2e590b27.tar.gz gitea-5df72ef7e791807600bc318c0282cf1b2e590b27.zip | |
Fix svg octicon-key placement (#11410)
| -rw-r--r-- | templates/repo/settings/deploy_keys.tmpl | 24 | ||||
| -rw-r--r-- | templates/user/settings/keys_gpg.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/settings/keys_ssh.tmpl | 4 |
3 files changed, 19 insertions, 13 deletions
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 2d228597e1..a22be48bb9 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -20,20 +20,22 @@ {{range .Deploykeys}} <div class="item"> <div class="right floated content"> - <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> - {{$.i18n.Tr "settings.delete_key"}} - </button> + <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> + {{$.i18n.Tr "settings.delete_key"}} + </button> </div> + <div class="left floated content"> <i class="{{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}>{{svg "octicon-key" 32}}</i> - <div class="content"> - <strong>{{.Name}}</strong> - <div class="print meta"> - {{.Fingerprint}} - </div> - <div class="activity meta"> - <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} - <span>{{$.i18n.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.i18n.Tr "settings.can_write_info"}} {{end}}</span></i> - </div> + </div> + <div class="content"> + <strong>{{.Name}}</strong> + <div class="print meta"> + {{.Fingerprint}} </div> + <div class="activity meta"> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{.CreatedUnix.FormatShort}}</span> — {{svg "octicon-info" 16}} {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span {{if .HasRecentActivity}}class="green"{{end}}>{{.UpdatedUnix.FormatShort}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}} - <span>{{$.i18n.Tr "settings.can_read_info"}}{{if not .IsReadOnly}} / {{$.i18n.Tr "settings.can_write_info"}} {{end}}</span></i> + </div> + </div> </div> {{end}} </div> diff --git a/templates/user/settings/keys_gpg.tmpl b/templates/user/settings/keys_gpg.tmpl index 3682d3237b..f86b44bef0 100644 --- a/templates/user/settings/keys_gpg.tmpl +++ b/templates/user/settings/keys_gpg.tmpl @@ -16,7 +16,9 @@ {{$.i18n.Tr "settings.delete_key"}} </button> </div> - <span class="{{if or .ExpiredUnix.IsZero ($.PageStartTime.Before .ExpiredUnix.AsTime)}}green{{end}}">{{svg "octicon-key" 32}}</span> + <div class="left floated content"> + <span class="{{if or .ExpiredUnix.IsZero ($.PageStartTime.Before .ExpiredUnix.AsTime)}}green{{end}}">{{svg "octicon-key" 32}}</span> + </div> <div class="content"> {{range .Emails}}<strong>{{.Email}} </strong>{{end}} <div class="print meta"> diff --git a/templates/user/settings/keys_ssh.tmpl b/templates/user/settings/keys_ssh.tmpl index f5c18d760e..fec68adc1f 100644 --- a/templates/user/settings/keys_ssh.tmpl +++ b/templates/user/settings/keys_ssh.tmpl @@ -20,7 +20,9 @@ {{$.i18n.Tr "settings.delete_key"}} </button> </div> - <span class="{{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}>{{svg "octicon-key" 32}}</span> + <div class="left floated content"> + <span class="{{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted tiny"{{end}}>{{svg "octicon-key" 32}}</span> + </div> <div class="content"> <strong>{{.Name}}</strong> <div class="print meta"> |