From ea938958a6c9ef49966ba1de8d3d5dfdc7173124 Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Sun, 26 May 2019 20:39:26 +0200
Subject: [PATCH] Fix styles

---
 src/lang/en.js                                |  3 ++-
 ...opdownMenu.vue => DropdownActionsMenu.vue} | 27 ++++++++++++++++---
 src/views/users/index.vue                     |  8 +++---
 3 files changed, 30 insertions(+), 8 deletions(-)
 rename src/views/users/components/{DropdownMenu.vue => DropdownActionsMenu.vue} (93%)

diff --git a/src/lang/en.js b/src/lang/en.js
index 1addb11b..4663a714 100644
--- a/src/lang/en.js
+++ b/src/lang/en.js
@@ -189,7 +189,8 @@ export default {
     sandbox: 'Force posts to be followers-only',
     disableRemoteSubscription: 'Disallow following user from remote instances',
     disableAnySubscription: 'Disallow following user at all',
-    selectUsers: 'Select users to apply actions to multiple users'
+    selectUsers: 'Select users to apply actions to multiple users',
+    moderateUsers: 'Moderate multiple users'
   },
   usersFilter: {
     inputPlaceholder: 'Select filter',
diff --git a/src/views/users/components/DropdownMenu.vue b/src/views/users/components/DropdownActionsMenu.vue
similarity index 93%
rename from src/views/users/components/DropdownMenu.vue
rename to src/views/users/components/DropdownActionsMenu.vue
index 644b1bb8..e310ed6f 100644
--- a/src/views/users/components/DropdownMenu.vue
+++ b/src/views/users/components/DropdownActionsMenu.vue
@@ -1,6 +1,14 @@
 <template>
-  <el-dropdown size="small" trigger="click">
-    <el-button v-if="isDesktop" icon="el-icon-edit" class="actions-button"/>
+  <el-dropdown size="small" trigger="click" placement="bottom-start">
+    <el-button v-if="isDesktop" class="actions-button">
+      <span class="actions-button-container">
+        <span>
+          <i class="el-icon-edit" />
+          {{ $t('users.moderateUsers') }}
+        </span>
+        <i class="el-icon-arrow-down el-icon--right"/>
+      </span>
+    </el-button>
     <el-dropdown-menu v-if="showDropdownForMultipleUsers" slot="dropdown">
       <el-dropdown-item
         @click.native="grantRightToMultipleUsers('admin')">
@@ -220,7 +228,20 @@ export default {
 
 <style rel='stylesheet/scss' lang='scss' scoped>
   .actions-button {
-    margin-left: 15px;
+    text-align: left;
+    margin: 0 15px 10px 0;
+    width: 350px;
+    padding: 10px 15px;
+  }
+  .actions-button-container {
+    display: flex;
+    justify-content: space-between;
+  }
+  .el-dropdown {
+    float: right;
+  }
+  .el-dropdown-menu {
+    margin-right: 15px;
   }
   .tag-container {
     display: flex;
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index bcb06bc8..3079bb76 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -8,7 +8,7 @@
       <users-filter/>
       <el-input :placeholder="$t('users.search')" class="search" @input="handleDebounceSearchInput"/>
     </div>
-    <dropdown-menu
+    <dropdown-actions-menu
       :selected-users="selectedUsers"
       @apply-action="clearSelection"/>
     <el-table
@@ -137,13 +137,13 @@
 import debounce from 'lodash.debounce'
 import numeral from 'numeral'
 import UsersFilter from './components/UsersFilter'
-import DropdownMenu from './components/DropdownMenu'
+import DropdownActionsMenu from './components/DropdownActionsMenu'
 
 export default {
   name: 'Users',
   components: {
     UsersFilter,
-    DropdownMenu
+    DropdownActionsMenu
   },
   data: function() {
     return {
@@ -265,7 +265,7 @@ export default {
     height: 36px;
     justify-content: space-between;
     align-items: center;
-    margin: 22px 15px 22px 15px
+    margin: 22px 15px 15px 15px
   }
   .user-count {
     color: gray;