removed unnecessary div from tabbed panel component, causes problems …

…when doing custom padding/margin/borders
Evolveum · Jan 4, 2023 · 60cfba8 · 60cfba8
1 parent 0dfde33
commit 60cfba8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.html
@@ -6,24 +6,22 @@
   ~ and European Union Public License. See LICENSE file for details.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <div class="card card-primary card-outline card-outline-tabs">
-        <div class="card-header p-0 border-bottom-0">
-            <ul class="nav nav-tabs" wicket:id="tabs-container">
-                <li class="nav-item" wicket:id="tabs">
-                    <a class="nav-link d-flex gap-2 align-items-center" href="#" wicket:id="link">
-                        <i wicket:id="icon"/>
-                        <span wicket:id="title"/>
-                        <small class="badge" wicket:id="count"/>
-                    </a>
-                </li>
-                <wicket:remove><!-- TODO fix the style for rightSideTabItem --></wicket:remove>
-                <li wicket:id="rightSideTabItem" class="pull-right" style="border-radius: 0; margin: 10px"><div wicket:id="rightSideTab"/></li>
-            </ul>
-        </div>
-        <div class="card-body">
-            <div class="tab-content">
-                <div wicket:id="panel" class="tab-pane active" />
-            </div>
+    <div class="card-header p-0 border-bottom-0">
+        <ul class="nav nav-tabs" wicket:id="tabs-container">
+            <li class="nav-item" wicket:id="tabs">
+                <a class="nav-link d-flex gap-2 align-items-center" href="#" wicket:id="link">
+                    <i wicket:id="icon"/>
+                    <span wicket:id="title"/>
+                    <small class="badge" wicket:id="count"/>
+                </a>
+            </li>
+            <wicket:remove><!-- TODO fix the style for rightSideTabItem --></wicket:remove>
+            <li wicket:id="rightSideTabItem" class="pull-right" style="border-radius: 0; margin: 10px"><div wicket:id="rightSideTab"/></li>
+        </ul>
+    </div>
+    <div class="card-body">
+        <div class="tab-content">
+            <div wicket:id="panel" class="tab-pane active" />
         </div>
     </div>
 </wicket:panel>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/TabbedPanel.java
@@ -103,6 +103,8 @@ public Integer getObject() {
             }
         };
 
+        add(AttributeModifier.prepend("class", "card card-primary card-outline card-outline-tabs"));
+
         WebMarkupContainer tabsContainer = newTabsContainer(ID_TABS_CONTAINER);
         tabsContainer.setOutputMarkupId(true);
         tabsContainer.setOutputMarkupPlaceholderTag(true);