aboutsummaryrefslogtreecommitdiffstats
path: root/web_src
diff options
context:
space:
mode:
Diffstat (limited to 'web_src')
-rw-r--r--web_src/css/modules/navbar.css16
-rw-r--r--web_src/css/modules/tippy.css7
-rw-r--r--web_src/js/features/contextpopup.js2
-rw-r--r--web_src/js/features/repo-code.js1
-rw-r--r--web_src/js/features/repo-issue.js1
-rw-r--r--web_src/js/features/stopwatch.js82
-rw-r--r--web_src/js/modules/tippy.js6
-rw-r--r--web_src/js/webcomponents/overflow-menu.js1
8 files changed, 60 insertions, 56 deletions
diff --git a/web_src/css/modules/navbar.css b/web_src/css/modules/navbar.css
index d7aa197e02..848f9331d0 100644
--- a/web_src/css/modules/navbar.css
+++ b/web_src/css/modules/navbar.css
@@ -103,19 +103,12 @@
width: 50%;
min-height: 48px;
}
+ #navbar #mobile-stopwatch-icon,
#navbar #mobile-notifications-icon {
margin-right: 6px !important;
}
}
-#navbar a.item .notification_count {
- color: var(--color-nav-bg);
- padding: 0 3.75px;
- font-size: 12px;
- line-height: 12px;
- font-weight: var(--font-weight-bold);
-}
-
#navbar a.item:hover .notification_count,
#navbar a.item:hover .header-stopwatch-dot {
border-color: var(--color-nav-hover-bg);
@@ -123,6 +116,11 @@
#navbar a.item .notification_count,
#navbar a.item .header-stopwatch-dot {
+ color: var(--color-nav-bg);
+ padding: 0 3.75px;
+ font-size: 12px;
+ line-height: 12px;
+ font-weight: var(--font-weight-bold);
background: var(--color-primary);
border: 2px solid var(--color-nav-bg);
position: absolute;
@@ -135,6 +133,8 @@
align-items: center;
justify-content: center;
z-index: 1; /* prevent menu button background from overlaying icon */
+ user-select: none;
+ white-space: nowrap;
}
.secondary-nav {
diff --git a/web_src/css/modules/tippy.css b/web_src/css/modules/tippy.css
index 6ac7c37d93..53c3d5aaea 100644
--- a/web_src/css/modules/tippy.css
+++ b/web_src/css/modules/tippy.css
@@ -16,8 +16,8 @@
.tippy-box {
position: relative;
- background-color: var(--color-body);
- color: var(--color-secondary-dark-6);
+ background-color: var(--color-menu);
+ color: var(--color-text);
border: 1px solid var(--color-secondary);
border-radius: var(--border-radius);
font-size: 1rem;
@@ -25,7 +25,6 @@
.tippy-content {
position: relative;
- padding: 1rem; /* if you need different padding, use different data-theme */
z-index: 1;
}
@@ -166,5 +165,5 @@
}
.tippy-svg-arrow-inner {
- fill: var(--color-body);
+ fill: var(--color-menu);
}
diff --git a/web_src/js/features/contextpopup.js b/web_src/js/features/contextpopup.js
index ce90f3e505..6a9325ed1c 100644
--- a/web_src/js/features/contextpopup.js
+++ b/web_src/js/features/contextpopup.js
@@ -18,6 +18,7 @@ export function attachRefIssueContextPopup(refIssues) {
if (!owner) return;
const el = document.createElement('div');
+ el.classList.add('tw-p-3');
refIssue.parentNode.insertBefore(el, refIssue.nextSibling);
const view = createApp(ContextPopup);
@@ -30,6 +31,7 @@ export function attachRefIssueContextPopup(refIssues) {
}
createTippy(refIssue, {
+ theme: 'default',
content: el,
placement: 'top-start',
interactive: true,
diff --git a/web_src/js/features/repo-code.js b/web_src/js/features/repo-code.js
index 63da5f2039..7c74c253a2 100644
--- a/web_src/js/features/repo-code.js
+++ b/web_src/js/features/repo-code.js
@@ -113,6 +113,7 @@ function showLineButton() {
btn.closest('.code-view').append(menu.cloneNode(true));
createTippy(btn, {
+ theme: 'menu',
trigger: 'click',
hideOnClick: true,
content: menu,
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index 2b2eed58bb..c4e14c62c4 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -502,6 +502,7 @@ export function initRepoPullRequestReview() {
if ($reviewBtn.length && $panel.length) {
const tippy = createTippy($reviewBtn[0], {
content: $panel[0],
+ theme: 'default',
placement: 'bottom',
trigger: 'click',
maxWidth: 'none',
diff --git a/web_src/js/features/stopwatch.js b/web_src/js/features/stopwatch.js
index 2ec74344fc..bcea26bd6e 100644
--- a/web_src/js/features/stopwatch.js
+++ b/web_src/js/features/stopwatch.js
@@ -1,4 +1,3 @@
-import prettyMilliseconds from 'pretty-ms';
import {createTippy} from '../modules/tippy.js';
import {GET} from '../modules/fetch.js';
import {hideElem, showElem} from '../utils/dom.js';
@@ -10,28 +9,31 @@ export function initStopwatch() {
return;
}
- const stopwatchEl = document.querySelector('.active-stopwatch-trigger');
+ const stopwatchEls = document.querySelectorAll('.active-stopwatch');
const stopwatchPopup = document.querySelector('.active-stopwatch-popup');
- if (!stopwatchEl || !stopwatchPopup) {
+ if (!stopwatchEls.length || !stopwatchPopup) {
return;
}
- stopwatchEl.removeAttribute('href'); // intended for noscript mode only
-
- createTippy(stopwatchEl, {
- content: stopwatchPopup,
- placement: 'bottom-end',
- trigger: 'click',
- maxWidth: 'none',
- interactive: true,
- hideOnClick: true,
- });
-
// global stop watch (in the head_navbar), it should always work in any case either the EventSource or the PeriodicPoller is used.
- const currSeconds = document.querySelector('.stopwatch-time')?.getAttribute('data-seconds');
- if (currSeconds) {
- updateStopwatchTime(currSeconds);
+ const seconds = stopwatchEls[0]?.getAttribute('data-seconds');
+ if (seconds) {
+ updateStopwatchTime(parseInt(seconds));
+ }
+
+ for (const stopwatchEl of stopwatchEls) {
+ stopwatchEl.removeAttribute('href'); // intended for noscript mode only
+
+ createTippy(stopwatchEl, {
+ content: stopwatchPopup.cloneNode(true),
+ placement: 'bottom-end',
+ trigger: 'click',
+ maxWidth: 'none',
+ interactive: true,
+ hideOnClick: true,
+ theme: 'default',
+ });
}
let usingPeriodicPoller = false;
@@ -124,10 +126,9 @@ async function updateStopwatch() {
function updateStopwatchData(data) {
const watch = data[0];
- const btnEl = document.querySelector('.active-stopwatch-trigger');
+ const btnEls = document.querySelectorAll('.active-stopwatch');
if (!watch) {
- clearStopwatchTimer();
- hideElem(btnEl);
+ hideElem(btnEls);
} else {
const {repo_owner_name, repo_name, issue_index, seconds} = watch;
const issueUrl = `${appSubUrl}/${repo_owner_name}/${repo_name}/issues/${issue_index}`;
@@ -137,31 +138,28 @@ function updateStopwatchData(data) {
const stopwatchIssue = document.querySelector('.stopwatch-issue');
if (stopwatchIssue) stopwatchIssue.textContent = `${repo_owner_name}/${repo_name}#${issue_index}`;
updateStopwatchTime(seconds);
- showElem(btnEl);
+ showElem(btnEls);
}
return Boolean(data.length);
}
-let updateTimeIntervalId = null; // holds setInterval id when active
-function clearStopwatchTimer() {
- if (updateTimeIntervalId !== null) {
- clearInterval(updateTimeIntervalId);
- updateTimeIntervalId = null;
- }
-}
+// TODO: This flickers on page load, we could avoid this by making a custom
+// element to render time periods. Feeding a datetime in backend does not work
+// when time zone between server and client differs.
function updateStopwatchTime(seconds) {
- const secs = parseInt(seconds);
- if (!Number.isFinite(secs)) return;
-
- clearStopwatchTimer();
- const stopwatch = document.querySelector('.stopwatch-time');
- // TODO: replace with <relative-time> similar to how system status up time is shown
- const start = Date.now();
- const updateUi = () => {
- const delta = Date.now() - start;
- const dur = prettyMilliseconds(secs * 1000 + delta, {compact: true});
- if (stopwatch) stopwatch.textContent = dur;
- };
- updateUi();
- updateTimeIntervalId = setInterval(updateUi, 1000);
+ if (!Number.isFinite(seconds)) return;
+ const datetime = (new Date(Date.now() - seconds * 1000)).toISOString();
+ for (const parent of document.querySelectorAll('.header-stopwatch-dot')) {
+ const existing = parent.querySelector(':scope > relative-time');
+ if (existing) {
+ existing.setAttribute('datetime', datetime);
+ } else {
+ const el = document.createElement('relative-time');
+ el.setAttribute('format', 'micro');
+ el.setAttribute('datetime', datetime);
+ el.setAttribute('lang', 'en-US');
+ el.setAttribute('title', ''); // make <relative-time> show no title and therefor no tooltip
+ parent.append(el);
+ }
+ }
}
diff --git a/web_src/js/modules/tippy.js b/web_src/js/modules/tippy.js
index 83b28e5745..a18c94cafb 100644
--- a/web_src/js/modules/tippy.js
+++ b/web_src/js/modules/tippy.js
@@ -37,8 +37,10 @@ export function createTippy(target, opts = {}) {
return onShow?.(instance);
},
arrow: arrow || (theme === 'bare' ? false : arrowSvg),
- role: role || 'menu', // HTML role attribute
- theme: theme || role || 'menu', // CSS theme, either "tooltip", "menu", "box-with-header" or "bare"
+ // HTML role attribute, ideally the default role would be "popover" but it does not exist
+ role: role || 'menu',
+ // CSS theme, either "default", "tooltip", "menu", "box-with-header" or "bare"
+ theme: theme || role || 'default',
plugins: [followCursor],
...other,
});
diff --git a/web_src/js/webcomponents/overflow-menu.js b/web_src/js/webcomponents/overflow-menu.js
index 0778c5990f..80dd1a545b 100644
--- a/web_src/js/webcomponents/overflow-menu.js
+++ b/web_src/js/webcomponents/overflow-menu.js
@@ -131,6 +131,7 @@ window.customElements.define('overflow-menu', class extends HTMLElement {
interactive: true,
placement: 'bottom-end',
role: 'menu',
+ theme: 'menu',
content: this.tippyContent,
onShow: () => { // FIXME: onShown doesn't work (never be called)
setTimeout(() => {
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-24 01:27:19 +0000