style fixes in group menu

Evolveum · Nov 23, 2022 · 7f5a5e2 · 7f5a5e2
1 parent 9877660
commit 7f5a5e2
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 17 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/_list-group-menu.scss b/gui/admin-gui/src/frontend/scss/_list-group-menu.scss
@@ -8,6 +8,8 @@
 $list-group-item-padding-sm-y: 0.5rem;
 $list-group-item-padding-sm-x: 1rem;
 
+$max-levels: 10;
+
 @mixin list-reset() {
   list-style: none;
   padding-left: 0;
@@ -148,14 +150,11 @@ $list-group-item-padding-sm-x: 1rem;
   @include list-group-menu-item;
   border-radius: inherit;
 
-  // 3rd level padding
-  & .list-group-submenu > .list-group-submenu-item > div {
-    padding-left: 3.25rem;
-  }
-
-  // 2nd level padding
-  & > div.item {
-    padding-left: 2rem;
+  // padding for level 3-10
+  @for $i from 2 through $max-levels {
+    & > div.item.level-#{$i} {
+      padding-left: 2rem + ($i - 2) * 1.25rem;
+    }
   }
 }
 

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItemPanel.java b/...n/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItemPanel.java
@@ -32,10 +32,10 @@ public class ListGroupMenuItemPanel<T extends Serializable> extends BasePanel<Li
     private static final String ID_ITEMS = "items";
     private static final String ID_ITEM = "item";
 
-    public ListGroupMenuItemPanel(String id, IModel<ListGroupMenuItem<T>> model) {
+    public ListGroupMenuItemPanel(String id, IModel<ListGroupMenuItem<T>> model, int level) {
         super(id, model);
 
-        initLayout();
+        initLayout(level);
     }
 
     @Override
@@ -45,10 +45,10 @@ protected void onComponentTag(ComponentTag tag) {
         checkComponentTag(tag, "li");
     }
 
-    private void initLayout() {
+    private void initLayout(int level) {
         add(AttributeAppender.append("class", () -> getModelObject().isOpen() ? "open" : null));
 
-        MenuItemLinkPanel link = new MenuItemLinkPanel(ID_LINK, getModel()) {
+        MenuItemLinkPanel link = new MenuItemLinkPanel(ID_LINK, getModel(), level) {
 
             @Override
             protected void onClickPerformed(AjaxRequestTarget target, ListGroupMenuItem item) {
@@ -80,7 +80,7 @@ protected void populateItem(ListItem<ListGroupMenuItem<T>> item) {
                     return;
                 }
 
-                item.add(new ListGroupMenuItemPanel(ID_ITEM, item.getModel()) {
+                item.add(new ListGroupMenuItemPanel(ID_ITEM, item.getModel(), level + 1) {
 
                     @Override
                     protected void onClickPerformed(AjaxRequestTarget target, ListGroupMenuItem item) {

diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuPanel.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuPanel.java
@@ -58,7 +58,7 @@ protected void populateItem(ListItem<ListGroupMenuItem<T>> item) {
                     return;
                 }
 
-                ListGroupMenuItemPanel menu = new ListGroupMenuItemPanel(ID_ITEM, item.getModel()) {
+                ListGroupMenuItemPanel menu = new ListGroupMenuItemPanel(ID_ITEM, item.getModel(), 0) {
 
                     @Override
                     protected void onClickPerformed(AjaxRequestTarget target, ListGroupMenuItem item) {

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/MenuItemLinkPanel.java b/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/MenuItemLinkPanel.java
@@ -35,14 +35,18 @@ public abstract class MenuItemLinkPanel<T extends Serializable> extends BasePane
     private static final String ID_CHEVRON = "chevron";
     private static final String ID_CHEVRON_LINK = "chevronLink";
 
-    public MenuItemLinkPanel(String id, IModel<ListGroupMenuItem<T>> model) {
+    private int level;
+
+    public MenuItemLinkPanel(String id, IModel<ListGroupMenuItem<T>> model, int level) {
         super(id, model);
 
+        this.level = level;
+
         initLayout();
     }
 
     private void initLayout() {
-        add(AttributeAppender.append("class", "item"));
+        add(AttributeAppender.append("class", "item " + "level-" + (level + 1)));
         add(AttributeAppender.append("class", () -> getModelObject().isActive() ? "active" : null));
         add(AttributeAppender.append("class", () -> getModelObject().isDisabled() ? "disabled" : null));
         AjaxLink link = new AjaxLink<>(ID_LINK) {

diff --git a/.../java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleOfTeammateMenuPanel.java b/.../java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleOfTeammateMenuPanel.java
@@ -76,7 +76,7 @@ private void initLayout() {
         container.add(new VisibleBehaviour(() -> getModelObject().isActive()));
         add(container);
 
-        MenuItemLinkPanel link = new MenuItemLinkPanel(ID_LINK, getModel()) {
+        MenuItemLinkPanel link = new MenuItemLinkPanel(ID_LINK, getModel(), 0) {
 
             @Override
             protected void onClickPerformed(AjaxRequestTarget target, ListGroupMenuItem item) {