Skip to content

Commit d3d543f

Browse files
authored
Merge pull request #200 from netcreateorg/hotfix-comment-zindex
hotfix-comment-zindex: Keep comments visible on top of comment status…
2 parents 7540e64 + eb5c1d8 commit d3d543f

File tree

3 files changed

+34
-11
lines changed

3 files changed

+34
-11
lines changed

app/view/netcreate/NetCreate.css

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,26 @@
1+
/* Z-Index
2+
3+
5000 NCDialog
4+
3000 nc-savelert
5+
2010 NCDialog .dialogWindow
6+
2001 NCDialog .screen ==========
7+
2000 comment-bar
8+
1030 bootstrap .fixed-top
9+
100 commentThread
10+
15 NCAutoSuggest .matchlist
11+
15 NCNode .ncedge
12+
10 NCNode .nccomponent
13+
1 NCNode .screen ============
14+
1 ToolTip .modal, .tooltiptextabove, .tooltiptext
15+
1 nc-navbar
16+
0 NetCreate
17+
*/
18+
19+
/* override bootstrap */
20+
nav.fixed-top {
21+
z-index: inherit;
22+
}
23+
124
/* Base App: NetCrate.jsx */
225
.nc-base {
326
display: flex;
@@ -27,7 +50,7 @@
2750
height: 38px;
2851
display: flex;
2952
flex-flow: row-reverse;
30-
z-index: 2000;
53+
z-index: 1;
3154
}
3255
/* Bootstrap override */
3356
.nav-item {

app/view/netcreate/components/NCComment.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ svg#comment-icon {
232232
max-height: calc(80% - 35px);
233233
font-size: 14px;
234234
cursor: move;
235-
z-index: 100;
235+
z-index: 2500;
236236
/* end floating */
237237
}
238238
.commentThread textarea.add {

app/view/netcreate/components/NCNode.jsx

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -241,17 +241,17 @@ class NCNode extends UNISYS.Component {
241241
SetPermissions(data) {
242242
UDATA.NetCall('SRV_GET_EDIT_STATUS').then(data => {
243243
// someone else might be editing a template or importing or editing node or edge
244-
const { id } = this.state;
245-
const nodeIsLocked = data.lockedNodes.includes(id);
246-
this.setState(
247-
{
248-
uIsLockedByDB: nodeIsLocked,
249-
uIsLockedByTemplate: data.templateBeingEdited,
244+
const { id } = this.state;
245+
const nodeIsLocked = data.lockedNodes.includes(id);
246+
this.setState(
247+
{
248+
uIsLockedByDB: nodeIsLocked,
249+
uIsLockedByTemplate: data.templateBeingEdited,
250250
uIsLockedByImport: data.importActive,
251251
uIsLockedByComment: data.commentBeingEditedByMe
252-
},
253-
() => this.UpdatePermissions()
254-
);
252+
},
253+
() => this.UpdatePermissions()
254+
);
255255
});
256256
}
257257
UpdatePermissions() {

0 commit comments

Comments
 (0)