mirror of
				https://github.com/go-gitea/gitea
				synced 2025-10-31 19:38:23 +00:00 
			
		
		
		
	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.
This commit is contained in:
		| @@ -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 { | ||||
|   | ||||
| @@ -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); | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user