Skip to content
Snippets Groups Projects
Unverified Commit e99377ec authored by aeschylus's avatar aeschylus Committed by GitHub
Browse files

Merge branch 'develop' into jquery-ui-css-scope

parents a584aecf 312da2f1
No related branches found
No related tags found
No related merge requests found
......@@ -22,6 +22,8 @@
height: ~"calc(100% - 75px)";
overflow-y: scroll;
margin-left: 240px;
margin-top: 10px;
border-top: 1px solid gray;
}
#collection-tree {
......@@ -39,7 +41,7 @@
height: 87%;
height: ~"calc(100% - 118px)";
}
#collection-tree {
height: 85%;
height: ~"calc(100% - 128px)";
......@@ -52,7 +54,7 @@
.jstree-default .jstree-node,
.jstree-default .jstree-icon,
/*.jstree-default .jstree-file,*/
/*.jstree-default .jstree-folder,*/
/*.jstree-default .jstree-folder,*/
#jstree-dnd.jstree-default .jstree-ok,
#jstree-dnd.jstree-default .jstree-er,
.jstree-default-small .jstree-node,
......@@ -94,4 +96,4 @@
.jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl
{
background-image: none !important;
}
\ No newline at end of file
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment