diff options
author | silverwind <me@silverwind.io> | 2020-11-10 19:28:07 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-10 20:28:07 +0200 |
commit | 21d496364a5e654ba535d06269f6c6679b5c2d74 (patch) | |
tree | 6d69c6397dfd135c6e60537d3368152e996c9184 /templates | |
parent | 9155f13bf859ae170892abd0bbb6860e4990263f (diff) | |
download | gitea-21d496364a5e654ba535d06269f6c6679b5c2d74.tar.gz gitea-21d496364a5e654ba535d06269f6c6679b5c2d74.zip |
Fix tooltips and issue dependency styles (#13458)
- Convert all tooltips to JS-based ones, fixing overflow issues
- Restyle issue dependencies/dependants
- Move popup styles to base style
- CSS Helper tweaks
- Unify pseudo element selectors and lint for it
Fixes: https://github.com/go-gitea/gitea/issues/13400
Diffstat (limited to 'templates')
-rw-r--r-- | templates/admin/user/edit.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/commits_table.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/create.tmpl | 2 | ||||
-rw-r--r-- | templates/repo/issue/view_content/sidebar.tmpl | 64 | ||||
-rw-r--r-- | templates/repo/release/list.tmpl | 4 | ||||
-rw-r--r-- | templates/repo/view_file.tmpl | 2 |
6 files changed, 41 insertions, 35 deletions
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl index a0edd68e48..e29b18f5be 100644 --- a/templates/admin/user/edit.tmpl +++ b/templates/admin/user/edit.tmpl @@ -90,7 +90,7 @@ </div> </div> <div class="inline field"> - <div class="ui checkbox" data-tooltip="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}"> + <div class="ui checkbox poping up" data-content="{{.i18n.Tr "admin.users.allow_git_hook_tooltip"}}" data-variation="very wide"> <label><strong>{{.i18n.Tr "admin.users.allow_git_hook"}}</strong></label> <input name="allow_git_hook" type="checkbox" {{if .User.CanEditGitHook}}checked{{end}} {{if DisableGitHooks}}disabled{{end}}> </div> diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 89355f0653..623df6f63e 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -17,7 +17,7 @@ <input type="checkbox" name="all" id="all" value="true" {{.All}}> <label for="all">{{.i18n.Tr "repo.commits.search_all"}} </label> </div> - <button class="ui primary tiny button mr-0" data-panel="#add-deploy-key-panel" data-tooltip={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button> + <button class="ui primary tiny button mr-0 poping up" data-panel="#add-deploy-key-panel" data-content={{.i18n.Tr "repo.commits.search.tooltip"}}>{{.i18n.Tr "repo.commits.find"}}</button> </form> {{else if .IsDiffCompare}} <a href="{{$.CommitRepoLink}}/commit/{{.BeforeCommitID}}" class="ui green sha label">{{if not .BaseIsCommit}}{{if .BaseIsBranch}}{{svg "octicon-git-branch"}}{{else if .BaseIsTag}}{{svg "octicon-tag"}}{{end}}{{.BaseBranch}}{{else}}{{ShortSha .BaseBranch}}{{end}}</a> diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index 6b9a2bca36..39759bcc4c 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -73,7 +73,7 @@ <input class="hidden" name="git_content" type="checkbox" tabindex="0" {{if .git_content}}checked{{end}}> <label>{{.i18n.Tr "repo.template.git_content"}}</label> </div> - <div class="ui checkbox" {{if not .SignedUser.CanEditGitHook}}data-tooltip="{{.i18n.Tr "repo.template.git_hooks_tooltip"}}"{{end}}> + <div class="ui checkbox{{if not .SignedUser.CanEditGitHook}} poping up{{end}}"{{if not .SignedUser.CanEditGitHook}} data-content="{{.i18n.Tr "repo.template.git_hooks_tooltip"}}"{{end}}> <input class="hidden" name="git_hooks" type="checkbox" tabindex="0" {{if .git_hooks}}checked{{end}}> <label>{{.i18n.Tr "repo.template.git_hooks"}}</label> </div> diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl index dad4f7e125..4165ba49e6 100644 --- a/templates/repo/issue/view_content/sidebar.tmpl +++ b/templates/repo/issue/view_content/sidebar.tmpl @@ -434,32 +434,35 @@ {{if (and (not .BlockedByDependencies) (not .BlockingDependencies))}} <span class="text"><strong>{{.i18n.Tr "repo.issues.dependency.title"}}</strong></span> <br> - <p>{{if .Issue.IsPull}} + <p> + {{if .Issue.IsPull}} {{.i18n.Tr "repo.issues.dependency.pr_no_dependencies"}} {{else}} {{.i18n.Tr "repo.issues.dependency.issue_no_dependencies"}} - {{end}}</p> + {{end}} + </p> {{end}} {{if .BlockingDependencies}} - <span class="text" data-tooltip="{{if .Issue.IsPull}} - {{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}} - {{else}} - {{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}} - {{end}}" data-inverted=""> - <strong>{{.i18n.Tr "repo.issues.dependency.blocks_short"}}</strong> + <span class="text poping up" data-content="{{if .Issue.IsPull}}{{.i18n.Tr "repo.issues.dependency.pr_close_blocks"}}{{else}}{{.i18n.Tr "repo.issues.dependency.issue_close_blocks"}}{{end}}"> + <strong>{{.i18n.Tr "repo.issues.dependency.blocks_short"}}</strong> </span> <div class="ui relaxed divided list"> {{range .BlockingDependencies}} - <div class="item{{if .Issue.IsClosed}} is-closed{{end}}"> - <span class="text grey right floated">#{{.Issue.Index}}</span> - <a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title | RenderEmoji}}</a> - <div class="text small">{{.Repository.OwnerName}}/{{.Repository.Name}}</div> - <div class="ui transparent label right floated nopadding"> + <div class="item{{if .Issue.IsClosed}} is-closed{{end}} df ac sb"> + <div class="item-left df jc fc f1"> + <a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}"> + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji}} + </a> + <div class="text small"> + {{.Repository.OwnerName}}/{{.Repository.Name}} + </div> + </div> + <div class="item-right df ac"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} - <a class="delete-dependency-button" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blocking');" - data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> - <i class="delete icon text red nopadding nomargin"></i> + <a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blocking');" + data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> + {{svg "octicon-trashcan" 16}} </a> {{end}} </div> @@ -469,24 +472,25 @@ {{end}} {{if .BlockedByDependencies}} - <span class="text" data-tooltip="{{if .Issue.IsPull}} - {{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}} - {{else}} - {{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}} - {{end}}" data-inverted=""> - <strong>{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}</strong> + <span class="text poping up" data-content="{{if .Issue.IsPull}}{{.i18n.Tr "repo.issues.dependency.pr_closing_blockedby"}}{{else}}{{.i18n.Tr "repo.issues.dependency.issue_closing_blockedby"}}{{end}}"> + <strong>{{.i18n.Tr "repo.issues.dependency.blocked_by_short"}}</strong> </span> <div class="ui relaxed divided list"> {{range .BlockedByDependencies}} - <div class="item{{if .Issue.IsClosed}} is-closed{{end}}"> - <span class="text grey right floated">#{{.Issue.Index}}</span> - <a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}">{{.Issue.Title | RenderEmoji}}</a> - <div class="text small">{{.Repository.OwnerName}}/{{.Repository.Name}}</div> - <div class="ui transparent label right floated nopadding"> + <div class="item{{if .Issue.IsClosed}} is-closed{{end}} df ac sb"> + <div class="item-left df jc fc f1"> + <a class="title" href="{{.Repository.Link}}/issues/{{.Issue.Index}}"> + #{{.Issue.Index}} {{.Issue.Title | RenderEmoji}} + </a> + <div class="text small"> + {{.Repository.OwnerName}}/{{.Repository.Name}} + </div> + </div> + <div class="item-right df ac"> {{if and $.CanCreateIssueDependencies (not $.Repository.IsArchived)}} - <a class="delete-dependency-button" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blockedBy');" - data-tooltip="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> - <i class="delete icon text red nopadding nomargin"></i> + <a class="delete-dependency-button poping up ci" onclick="window.deleteDependencyModal({{.Issue.ID}}, 'blockedBy');" + data-content="{{$.i18n.Tr "repo.issues.dependency.remove_info"}}" data-inverted=""> + {{svg "octicon-trashcan" 16}} </a> {{end}} </div> diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 71d40fdb23..a05d671b15 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -152,7 +152,9 @@ {{if .Attachments}} {{range .Attachments}} <li> - <span class="ui text right" data-tooltip="{{$.i18n.Tr "repo.release.download_count" (.DownloadCount | PrettyNumber)}}" data-position="bottom right">{{svg "octicon-info"}}</span> + <span class="ui text right poping up" data-content="{{$.i18n.Tr "repo.release.download_count" (.DownloadCount | PrettyNumber)}}"> + {{svg "octicon-info"}} + </span> <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> <strong><span class="ui image" title='{{.Name}}'>{{svg "octicon-package" 16 "mr-2"}}</span>{{.Name}}</strong> <span class="ui text grey right">{{.Size | FileSize}}</span> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index a849fa1f84..2ad31f8c37 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -22,7 +22,7 @@ </div> {{end}} {{if .LFSLock}} - <div class="file-info-entry ui" data-tooltip="{{.LFSLockHint}}" data-inverted=""> + <div class="file-info-entry ui poping up" data-content="{{.LFSLockHint}}"> {{svg "octicon-lock" 16 "mr-2"}} <a href="{{AppSubUrl}}/{{.LFSLock.Owner.Name}}">{{.LFSLockOwner}}</a> </div> |