fix: tooltips when used in elevated contexts (gitbutlerapp#4703)

liyingqin · Aug 16, 2024 · 7dc8299 · 7dc8299
1 parent bb6a7d8
commit 7dc8299
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/apps/desktop/src/lib/branch/BranchLaneContextMenu.svelte b/apps/desktop/src/lib/branch/BranchLaneContextMenu.svelte
@@ -130,7 +130,7 @@
 				slot="control"
 				bind:checked={allowRebasing}
 				on:click={toggleAllowRebasing}
-				help="Having this enabled permits commit amending and reordering after a branch has been pushed, which would subsequently require force pushing"
+				help="Allows changing commits after push (force push needed)"
 			/>
 		</ContextMenuItem>
 	</ContextMenuSection>

diff --git a/packages/ui/src/styles/components/tooltip.css b/packages/ui/src/styles/components/tooltip.css
@@ -6,7 +6,7 @@
 	color: var(--clr-core-ntrl-60);
 	display: inline-block;
 	padding: 6px 8px;
-	z-index: var(--z-tooltip);
+	z-index: var(--z-blocker);
 
 	max-width: 180px;
 	position: absolute;

diff --git a/packages/ui/src/styles/core/variables.css b/packages/ui/src/styles/core/variables.css
@@ -9,8 +9,7 @@
 	--z-lifted: 2;
 	--z-floating: 3;
 	--z-modal: 4;
-	--z-tooltip: 9;
-	--z-blocker: 10;
+	--z-blocker: calc(infinity);
 
 	/* TODO: add focus color */
 	--focus-color: var(--clr-scale-pop-50);