Merge remote-tracking branch 'origin/master'

Evolveum · Dec 21, 2018 · ebd2082 · ebd2082
2 parents 71f97bf + 5244d0a
commit ebd2082
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/OrgTreePanel.html
@@ -24,7 +24,7 @@ <h3 class="box-title"><div wicket:id="treeTitle"/></h3>
 				<div class="cog" wicket:id="treeMenu" about="treeMenu"/>
 			</div>
 		</div>
-		<div wicket:id="treeContainer" class="box-body org-tree-container" style="flex: 100 1 auto; max-height: 50vh">
+		<div wicket:id="treeContainer" class="box-body org-tree-container" style="flex: 100 1 auto;">
 			<div wicket:id="tree"/>
 		</div>
 	</div>	

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/RoleCatalogTabPanel.html
@@ -20,7 +20,7 @@
 <body>
 <wicket:extend>
     <div wicket:id="treePanelContainer" class="col-md-3" >
-        <div wicket:id="treePanel"/>
+        <div class="role-catalog" wicket:id="treePanel"/>
     </div>
 </wicket:extend>
 </body>

diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less
@@ -1416,4 +1416,8 @@ th.countLabel{
   .content-wrapper {
     width: 100%;
   }
+}
+
+.role-catalog > .object-org-box > .org-tree-container{
+	max-height: 50vh;
 }