Skip to content

Commit

Permalink
Use separate class for tippy targets (go-gitea#20742)
Browse files Browse the repository at this point in the history
Previous solution that re-purposed the 'hide' class by making it
`!important` had various unintended side-effects where jQuery .show() was
not able to outweight it. Use a separate class to prevent these
interactions.
  • Loading branch information
silverwind authored and Sysoev, Vladimir committed Aug 28, 2022
1 parent 4d956c0 commit c296bdc
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion templates/base/head_navbar.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<span class="sr-mobile-only">{{.locale.Tr "active_stopwatch"}}</span>
</span>
</a>
<div class="active-stopwatch-popup hide">
<div class="active-stopwatch-popup tippy-target">
<div class="df ac">
<a class="stopwatch-link df ac" href="{{.ActiveStopwatch.IssueLink}}">
{{svg "octicon-issue-opened" 16 "mr-3"}}
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/commit_statuses.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<a class="ui link commit-statuses-trigger vm">{{template "repo/commit_status" .Status}}</a>
<div class="ui commit-statuses-popup commit-statuses hide">
<div class="ui commit-statuses-popup commit-statuses tippy-target">
<div class="ui relaxed list divided">
{{range .Statuses}}
<div class="ui item singular-status df">
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/view_file.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
{{end}}
</tbody>
</table>
<div class="code-line-menu ui vertical pointing menu hide">
<div class="code-line-menu ui vertical pointing menu tippy-target">
{{if $.Permission.CanRead $.UnitTypeIssues}}
<a class="item ref-in-new-issue" href="{{.RepoLink}}/issues/new?body={{.Repository.HTMLURL}}{{printf "/src/commit/" }}{{PathEscape .CommitID}}/{{PathEscapeSegments .TreePath}}" rel="nofollow noindex">{{.locale.Tr "repo.issues.context.reference_issue"}}</a>
{{end}}
Expand Down
7 changes: 4 additions & 3 deletions web_src/js/modules/tippy.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ export function createTippy(target, opts = {}) {
...opts,
});

// for popups where content refers to a DOM element, we use the 'hide' class to initially hide
// the content, now we can remove it as the content has been removed from the DOM by tippy
// for popups where content refers to a DOM element, we use the 'tippy-target' class
// to initially hide the content, now we can remove it as the content has been removed
// from the DOM by tippy
if (opts.content instanceof Element) {
opts.content.classList.remove('hide');
opts.content.classList.remove('tippy-target');
}

return instance;
Expand Down
2 changes: 1 addition & 1 deletion web_src/less/_base.less
Original file line number Diff line number Diff line change
Expand Up @@ -1315,7 +1315,7 @@ footer {
}

.hide {
display: none !important;
display: none;

&.show-outdated {
display: none !important;
Expand Down
5 changes: 5 additions & 0 deletions web_src/less/modules/tippy.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/* styles are based on node_modules/tippy.js/dist/tippy.css */

// class to hide tippy target elements on page load
.tippy-target {
display: none !important;
}

[data-tippy-root] {
max-width: calc(100vw - 10px);
}
Expand Down

0 comments on commit c296bdc

Please sign in to comment.