aboutsummaryrefslogtreecommitdiffstats
path: root/web_src/css/modules
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2024-04-30 16:52:46 +0200
committerGitHub <noreply@github.com>2024-04-30 14:52:46 +0000
commit564102ce89f53d6bd2fdbaa33416e4287d6fe9a8 (patch)
tree27a99fad3cd53e7fef837f5bbbe8a8d81b2a38df /web_src/css/modules
parent5f05e7b41a57972cc418a125d9263173b7b9838f (diff)
downloadgitea-564102ce89f53d6bd2fdbaa33416e4287d6fe9a8.tar.gz
gitea-564102ce89f53d6bd2fdbaa33416e4287d6fe9a8.zip
Rework and fix stopwatch (#30732)
Fixes https://github.com/go-gitea/gitea/issues/30721 and overhauls the stopwatch. Time is now shown inside the "dot" icon and on both mobile and desktop. All rendering is now done by `<relative-time>`, the `pretty-ms` dependency is dropped. Desktop: <img width="557" alt="Screenshot 2024-04-29 at 22 33 27" src="https://github.com/go-gitea/gitea/assets/115237/3a46cdbf-6af2-4bf9-b07f-021348badaac"> Mobile: <img width="640" alt="Screenshot 2024-04-29 at 22 34 19" src="https://github.com/go-gitea/gitea/assets/115237/8a2beea7-bd5d-473f-8fff-66f63fd50877"> Note for tippy: Previously, tippy instances defaulted to "menu" theme, but that theme is really only meant for `.ui.menu`, so it was not optimal for the stopwatch popover. This introduces a unopinionated `default` theme that has no padding and should be suitable for all content. I reviewed all existing uses and explicitely set the desired `theme` on all of them.
Diffstat (limited to 'web_src/css/modules')
-rw-r--r--web_src/css/modules/navbar.css16
-rw-r--r--web_src/css/modules/tippy.css7
2 files changed, 11 insertions, 12 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);
}