mhutchie#132 fix overlapping issues

bendera · Dec 18, 2020 · ea74823 · ea74823
1 parent 11d67b1
commit ea74823
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/gitGraphView.ts b/src/gitGraphView.ts
@@ -685,8 +685,8 @@ export class GitGraphView extends Disposable {
 					<div id="commitTable"></div>
 				</div>
 				<div id="footer"></div>
+				<div id="scrollShadow"></div>
 			</div>
-			<div id="scrollShadow"></div>
 			<script nonce="${nonce}">var initialState = ${JSON.stringify(initialState)}, globalState = ${JSON.stringify(globalState)}, workspaceState = ${JSON.stringify(workspaceState)};</script>
 			<script nonce="${nonce}" src="${this.getMediaUri('out.min.js')}"></script>
 			</body>`;

diff --git a/web/styles/main.css b/web/styles/main.css
@@ -72,7 +72,7 @@ body.selection-background-color-exists ::selection{
 	right:0;
 	height:6px;
 	box-shadow: inset 0 6px 6px -6px var(--vscode-scrollbar-shadow);
-	z-index:20;
+	z-index:11;
 	pointer-events:none;
 }
 
@@ -283,7 +283,7 @@ body.selection-background-color-exists ::selection{
 #tableColHeaders.sticky .tableColHeader {
 	position: sticky;
 	top: inherit;
-	z-index: 3;
+	z-index: 11;
 	background-color: var(--vscode-editor-background);
 }
 .resizeCol{
@@ -795,7 +795,7 @@ body.tagLabelsRightAligned .gitRef.tag{
 
 #controls.sticky {
 	position:sticky;
-	z-index: 4;
+	z-index:12;
 }
 
 #repoControl, #branchControl, #showRemoteBranchesControl{