Skip to content

Commit 958d967

Browse files
committed
fix: z-index on table header and divider
1 parent 46f67d0 commit 958d967

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "0.0.58-beta-10",
7+
"@devtron-labs/devtron-fe-common-lib": "0.0.58-beta-11",
88
"@rjsf/core": "^5.13.3",
99
"@rjsf/utils": "^5.13.3",
1010
"@rjsf/validator-ajv8": "^5.13.3",

src/Pages/GlobalConfigurations/Authorization/PermissionGroups/List/PermissionGroupList.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ const PermissionGroupList = () => {
117117
)}
118118
{isLoading || (result.totalCount && result.permissionGroups.length) ? (
119119
<div className="flexbox-col flex-grow-1">
120-
<div className="user-permission__header cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0">
120+
<div className="user-permission__header cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0 dc__zi-1">
121121
<span />
122122
<SortableTableHeaderCell
123123
title="Name"

src/Pages/GlobalConfigurations/Authorization/UserPermissions/AddEdit/UserForm.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ const UserForm = ({ isAddMode, userData = null }: { isAddMode: boolean; userData
439439
</span>
440440
)}
441441
</div>
442-
<div className="dc__border-top-n1" />
442+
{!isAutoAssignFlowEnabled && <div className="dc__border-top-n1" />}
443443
</>
444444
)}
445445
{!isAddMode && isAutoAssignFlowEnabled && (

src/Pages/GlobalConfigurations/Authorization/UserPermissions/List/UserPermissionList.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const UserPermissionList = () => {
120120
<div
121121
className={`user-permission__header ${
122122
showStatus ? 'user-permission__header--with-status' : ''
123-
} cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0`}
123+
} cn-7 fs-12 fw-6 lh-20 dc__uppercase pl-20 pr-20 dc__border-bottom dc__position-sticky dc__top-0 bcn-0 dc__zi-1`}
124124
>
125125
<span />
126126
<SortableTableHeaderCell

src/css/base.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3859,6 +3859,10 @@ textarea::placeholder {
38593859
border: solid 1px transparent;
38603860
}
38613861

3862+
.dc__zi-1 {
3863+
z-index: 1;
3864+
}
3865+
38623866
.dc__zi-4 {
38633867
z-index: 4;
38643868
}

0 commit comments

Comments
 (0)