top right menu css fix, now in theme

Evolveum · Oct 5, 2015 · 553734a · 553734a
1 parent ac6f69d
commit 553734a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/UserMenuPanel.html
@@ -22,7 +22,7 @@
         <img src="img/placeholder.png" class="user-image" alt="User Image"/>
         <span class="hidden-xs" wicket:id="usernameLink"/>
     </a>
-    <ul class="dropdown-menu" style="border-color: #367fa9;">
+    <ul class="dropdown-menu">
         <!-- User image -->
         <li class="user-header">
             <!-- todo image -->
@@ -40,7 +40,7 @@
             </div>
         </li>
         <!-- Menu Footer-->
-        <li class="user-footer" style="border-color: #367fa9; border-bottom-right-radius: 4px; border-bottom-left-radius: 4px;">
+        <li class="user-footer">
             <div class="pull-left">
                 <a class="btn btn-default btn-flat" wicket:id="resetPassword"/>
             </div>

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -32,4 +32,16 @@ div.btn-group.bootstrap-select.select-picker-sm {
 div.form-inline > div.form-group {
   margin-left: 0;
   margin-right: 0;
+}
+
+li.dropdown.user.user-menu {
+  & > ul.dropdown-menu {
+    border-color: #367fa9;
+
+    & > li.user-footer {
+      border-color: #367fa9;
+      border-bottom-right-radius: 4px;
+      border-bottom-left-radius: 4px;
+    }
+  }
 }