MID-6271 style fixes all over the place

Evolveum · Apr 13, 2022 · ea7efcb · ea7efcb
1 parent 6bf1977
commit ea7efcb
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 37 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -130,7 +130,7 @@ public class GuiStyleConstants {
     public static final String CLASS_ICON_RESOURCE_SCHEMA = "fa fa-code";
     public static final String CLASS_ICON_RESOURCE_SCHEMA_HANDLING_COLORED = "fa fa-exchange";
     public static final String CLASS_ICON_ASSIGNMENTS = "fa fa-bank";
-    public static final String CLASS_SHADOW_ICON_REQUEST = "fa fa-pencil-square-o";
+    public static final String CLASS_SHADOW_ICON_REQUEST = "fa fa-pen-square";
     public static final String CLASS_ICON_TACHOMETER = "fa fa-tachometer-alt";
     public static final String CLASS_ICON_COLLAPSE_CONTAINER = "fa fa-caret-down fa-lg";
     public static final String CLASS_ICON_EXPAND_CONTAINER = "fa fa-caret-right fa-lg";

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.html b/...i/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/DetailsNavigationPanel.html
@@ -17,7 +17,7 @@
                         <span class="details-menu-label" wicket:id="navItem"></span>
                         <span class="pull-right-container">
                             <i class="fa fa-fw fa-angle-left pull-right" wicket:id="submenuLink"></i>
-                            <small class="label pull-right bg-blue" wicket:id="count"></small>
+                            <span class="badge pull-right bg-blue" wicket:id="count"></span>
                         </span>
                     </a>
                     <div wicket:id="subNavigation"/>

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.html
@@ -12,29 +12,23 @@
 
     <wicket:fragment wicket:id="details">
         <div class="row">
-            <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                <div wicket:id="summary"></div>
-            </div>
-            <form wicket:id="mainForm">
-                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                    <span wicket:id="buttons"/>
-                </div>
+            <div class="col-lg-12" wicket:id="summary"></div>
+        </div>
+        <div class="row">
+            <form class="col-lg-12" wicket:id="mainForm">
+                <div wicket:id="buttons"/>
 
-                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                    <div class="details-panel">
-                        <wicket:enclosure child="navigation">
-                            <div class="details-panel-navigation">
-                                <div wicket:id="navigation"></div>
-                            </div>
-                        </wicket:enclosure>
-                        <div class="details-panel-details-form">
-                            <div wicket:id="mainPanel"></div>
+                <div class="details-panel">
+                    <wicket:enclosure child="navigation">
+                        <div class="details-panel-navigation">
+                            <div wicket:id="navigation"></div>
                         </div>
+                    </wicket:enclosure>
+                    <div class="details-panel-details-form">
+                        <div wicket:id="mainPanel"></div>
                     </div>
                 </div>
-
             </form>
-
         </div>
     </wicket:fragment>
     <wicket:child/>

diff --git a/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.html b/...ain/java/com/evolveum/midpoint/gui/impl/page/admin/component/OperationalButtonsPanel.html
@@ -8,8 +8,8 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div class="box box-solid">
-        <div class="box-body">
+    <div class="card">
+        <div class="card-body">
             <div class="main-button-bar">
                 <fieldset class="objectButtons col-lg-2">
                     <legend><wicket:message key="OperationalButtonsPanel.buttons.main"/></legend>

diff --git a/...ain/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html b/...ain/java/com/evolveum/midpoint/web/component/form/multivalue/MultiValueTextEditPanel.html
@@ -22,7 +22,7 @@
 
                     <div wicket:id="buttonGroup" class="input-group-btn">
                         <a wicket:id="edit" class="btn btn-sm btn-primary" title="Edit">
-                            <i class="fa fa-pencil-square-o"/>
+                            <i class="fa fa-pen-square"/>
                         </a>
                         <a wicket:id="delete" class="btn btn-sm btn-danger" title="Remove">
                             <i class="fa fa-minus"/>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/MainMenuPanel.html
@@ -17,11 +17,7 @@
                 </wicket:enclosure>
             </p>
 
-            <wicket:enclosure child="bubble">
-                <span class="pull-right-container">
-                    <span class="label label-primary pull-right" wicket:id="bubble"/>
-                </span>
-            </wicket:enclosure>
+            <span class="badge badge-primary right" wicket:id="bubble"/>
         </a>
         <ul wicket:id="submenu" class="nav nav-treeview">
             <li wicket:id="subItem" class="nav-item">

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/SideBarMenuPanel.html
@@ -12,9 +12,8 @@
         <ul class="nav nav-pills nav-sidebar flex-column nav-legacy" data-widget="treeview" role="menu" data-accordion="false" wicket:id="sidebar">
             <wicket:container wicket:id="menuItems">
                 <li class="nav-header" wicket:id="header">
-                    <span wicket:id="name">
-                    </span>
-                    <i class="fa fa-chevron-down pull-right"></i>
+                    <span wicket:id="name"/>
+                    <i class="fa fa-chevron-down ml-2"></i>
                 </li>
                 <wicket:container wicket:id="items">
                     <wicket:container wicket:id="item"/>

diff --git a/...rc/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.html b/...rc/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.html
@@ -9,9 +9,8 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
     <div class="card" wicket:id="dashboardParent">
-        <div class="card-header with-border" wicket:id="dashboardTitle">
-            <i wicket:id="icon"/>
-            <h3 class="card-title"><span wicket:id="title"/></h3>
+        <div class="card-header" wicket:id="dashboardTitle">
+            <h3 class="card-title"><i class="mr-2" wicket:id="icon"/> <span wicket:id="title"/></h3>
         </div>
         <div class="card-body" wicket:id="dashboardContent">
             <div wicket:id="preloaderContainer" style="margin: 10px 0; text-align: center;">

diff --git a/...rc/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java b/...rc/main/java/com/evolveum/midpoint/web/page/admin/home/component/AsyncDashboardPanel.java
@@ -77,7 +77,7 @@ public AsyncDashboardPanel(String id, IModel<String> title, String icon, IModel<
         dashboardParent.add(new AttributeAppender("class", " " + boxCssClasses));
 
         WebMarkupContainer iconI = new WebMarkupContainer(ID_ICON);
-        iconI.add(AttributeModifier.replace("class", icon));
+        iconI.add(AttributeModifier.append("class", icon));
         dashboardTitle.add(iconI);
     }
 

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.html b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.html
@@ -10,7 +10,7 @@
 <wicket:panel>
     <div class="card card-outline" wicket:id="dashboardParent">
         <div class="card-header" wicket:id="dashboardTitle">
-            <h3 class="card-title"><i wicket:id="icon"/> <span wicket:id="title"/></h3>
+            <h3 class="card-title"><i class="mr-2" wicket:id="icon"/> <span wicket:id="title"/></h3>
         </div>
         <div class="card-body p-0" wicket:id="dashboardContent">
             <div wicket:id="content"/>

diff --git a/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.java b/...gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/component/DashboardPanel.java
@@ -58,7 +58,7 @@ private void initLayout(IModel<String> titleModel, String icon, String boxCssCla
         dashboardParent.add(dashboardContent);
 
         WebMarkupContainer iconI = new WebMarkupContainer(ID_ICON);
-        iconI.add(AttributeModifier.replace("class", icon));
+        iconI.add(AttributeModifier.append("class", icon));
         dashboardTitle.add(iconI);
     }
 

diff --git a/gui/admin-gui/src/main/resources/static/scss/midpoint-theme.scss b/gui/admin-gui/src/main/resources/static/scss/midpoint-theme.scss
@@ -2175,3 +2175,7 @@ th, td {
     width: 120px;
   }
 }
+
+.nav-sidebar > .nav-header > span {
+  text-transform: uppercase;
+}