diff --git a/apps/settings/css/settings.scss b/apps/settings/css/settings.scss index 1cc1c014bd73a456305f1390c931c9fc18a7be96..f94b4a925758c2ef07277c1cb1010218008b3b65 100644 --- a/apps/settings/css/settings.scss +++ b/apps/settings/css/settings.scss @@ -597,8 +597,8 @@ span.usersLastLoginTooltip { } .userActions { position: sticky; - right: 50px; - z-index: 110; + right: 60px; + z-index: 20; } .userActions input { width: 44px; @@ -1371,6 +1371,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { grid-row-start: span 1; grid-gap: 3px; align-items: center; + z-index: 0; /* let's define the column until storage path, what follows will be manually defined */ grid-template-columns: 44px minmax($grid-col-min-width + 30px, 1fr) repeat(auto-fit, minmax($grid-col-min-width, 1fr)); @@ -1408,7 +1409,7 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { .userActions { min-width: 44px; position: sticky; - right: 50px; + right: 20px; z-index: 109; } .subtitle { diff --git a/apps/settings/js/vue-1.js b/apps/settings/js/vue-1.js new file mode 100644 index 0000000000000000000000000000000000000000..c3128715eeb64228bf843b7266b1cc1ef1e6bdd8 Binary files /dev/null and b/apps/settings/js/vue-1.js differ diff --git a/apps/settings/js/vue-1.js.map b/apps/settings/js/vue-1.js.map new file mode 100644 index 0000000000000000000000000000000000000000..6fd2f125c9178a4ca043598efb48a2346f07c0c9 Binary files /dev/null and b/apps/settings/js/vue-1.js.map differ diff --git a/apps/settings/js/vue-3.js b/apps/settings/js/vue-3.js new file mode 100644 index 0000000000000000000000000000000000000000..82c330b7e651369377088f5dd868a007fa34f9ac Binary files /dev/null and b/apps/settings/js/vue-3.js differ diff --git a/apps/settings/js/vue-3.js.map b/apps/settings/js/vue-3.js.map new file mode 100644 index 0000000000000000000000000000000000000000..3b3fa557d266b540abcaeaabe8da0905c30ce03c Binary files /dev/null and b/apps/settings/js/vue-3.js.map differ diff --git a/apps/settings/src/components/UserList/UserRow.vue b/apps/settings/src/components/UserList/UserRow.vue index 39d98f46f97471fbb5c33a4fbb66c1df943bf312..e7c039376f5a3b28754b9fa2fb549ae1ad0faf43 100644 --- a/apps/settings/src/components/UserList/UserRow.vue +++ b/apps/settings/src/components/UserList/UserRow.vue @@ -56,10 +56,14 @@ :sub-admins-groups="subAdminsGroups" :user-actions="userActions" :user="user" + :class="{'row--menu-opened': openedMenu}" @hideMenu="hideMenu" @toggleMenu="toggleMenu" /> <div v-else - :class="{'disabled': loading.delete || loading.disable}" + :class="{ + 'disabled': loading.delete || loading.disable, + 'row--menu-opened': openedMenu + }" :data-id="user.id" class="row row--editable"> <div :class="{'icon-loading-small': loading.delete || loading.disable || loading.wipe}" @@ -675,3 +679,9 @@ export default { }, } </script> +<style scoped lang="scss"> + // Force menu to be above other rows + .row--menu-opened { + z-index: 1 !important; + } +</style>