diff --git a/app/assets/javascripts/discourse/templates/group-index.hbs b/app/assets/javascripts/discourse/templates/group-index.hbs index ee9f4c8659f..57e984d8452 100644 --- a/app/assets/javascripts/discourse/templates/group-index.hbs +++ b/app/assets/javascripts/discourse/templates/group-index.hbs @@ -1,20 +1,24 @@
- {{text-field value=filterInput - placeholderKey=filterPlaceholder - class="group-username-filter no-blur"}} - - {{#if canManageGroup}} - {{#if currentUser.admin}} - {{group-members-dropdown - showAddMembersModal="showAddMembersModal" - showBulkAddModal="showBulkAddModal"}} - {{else}} - {{d-button icon="plus" - action="showAddMembersModal" - label="groups.add_members.title" - class="group-members-add"}} - {{/if}} + {{#if hasMembers}} + {{text-field value=filterInput + placeholderKey=filterPlaceholder + class="group-username-filter no-blur"}} {{/if}} + +
+ {{#if canManageGroup}} + {{d-button icon="plus" + action="showAddMembersModal" + label="groups.add_members.title" + class="group-members-add"}} + {{#if currentUser.admin}} + {{d-button icon="plus" + action="showBulkAddModal" + label="admin.groups.bulk_add.title" + class="group-bulk-add"}} + {{/if}} + {{/if}} +
{{#if hasMembers}} diff --git a/app/assets/stylesheets/common/base/group.scss b/app/assets/stylesheets/common/base/group.scss index 9852f3379a8..57d634ee9d1 100644 --- a/app/assets/stylesheets/common/base/group.scss +++ b/app/assets/stylesheets/common/base/group.scss @@ -14,18 +14,19 @@ } .group-members-actions { - position: absolute; - top: -49px; - right: 0px; + display: flex; + flex-wrap: wrap; + width: 100%; + + input + .group-members-add { + margin-left: auto; + } .group-username-filter { - margin: 0px; + margin: 0 0 5px 0; vertical-align: middle; } - .group-members-dropdown, .group-members-add { - vertical-align: middle; - } } .group-info {