diff --git a/website/client/src/assets/scss/dropdown.scss b/website/client/src/assets/scss/dropdown.scss index fca1cb9e19..6eb060003a 100644 --- a/website/client/src/assets/scss/dropdown.scss +++ b/website/client/src/assets/scss/dropdown.scss @@ -120,7 +120,7 @@ } .dropdown-menu.show { - width: 100% !important; + min-width: 100% !important; } } diff --git a/website/client/src/components/challenges/challengeDetail.vue b/website/client/src/components/challenges/challengeDetail.vue index 7df3a527b1..29d41aaec0 100644 --- a/website/client/src/components/challenges/challengeDetail.vue +++ b/website/client/src/components/challenges/challengeDetail.vue @@ -99,11 +99,12 @@
- + + +
- + + + +
@@ -386,9 +379,11 @@ import blockIcon from '@/assets/svg/block.svg'; import messageIcon from '@/assets/members/message.svg'; import starIcon from '@/assets/members/star.svg'; import dots from '@/assets/svg/dots.svg'; +import SelectList from '@/components/ui/selectList'; export default { components: { + SelectList, MemberDetails, removeMemberModal, loadingGryphon, @@ -396,7 +391,11 @@ export default { props: ['hideBadge'], data () { return { - sortOption: {}, + sortOption: { + // default sort options + value: 'stats.class', + direction: 'asc', + }, sortDirty: false, selectedPage: 'members', members: [], @@ -509,6 +508,12 @@ export default { return sortedMembers; }, + optionEntryBySelectedValue () { + return this.sortOptions.find(o => o.value === this.sortOption.value); + }, + directionEntryBySelectedValue () { + return this.sortDirections.find(o => o.value === this.sortOption.direction); + }, }, watch: { // Watches `searchTerm` and if present, performs a `searchMembers` action @@ -620,11 +625,11 @@ export default { this.$root.$emit('bv::hide::modal', 'members-modal'); }, changeSortOption (e) { - this.sortOption.value = e.target.value; + this.sortOption.value = e.value; this.sort(); }, changeSortDirection (e) { - this.sortOption.direction = e.target.value; + this.sortOption.direction = e.value; this.sort(); }, sort () { diff --git a/website/client/src/components/inventory/equipment/index.vue b/website/client/src/components/inventory/equipment/index.vue index 1ecfe5bae7..351eada008 100644 --- a/website/client/src/components/inventory/equipment/index.vue +++ b/website/client/src/components/inventory/equipment/index.vue @@ -63,8 +63,6 @@ :items="groupByItems" :value="groupBy" class="array-select" - :class="{disabled: disabled}" - :disabled="disabled" :right="true" :hide-icon="false" :inline-dropdown="false" diff --git a/website/client/src/components/inventory/equipment/unequipDropdown.vue b/website/client/src/components/inventory/equipment/unequipDropdown.vue index 971d8869f7..49285c1687 100644 --- a/website/client/src/components/inventory/equipment/unequipDropdown.vue +++ b/website/client/src/components/inventory/equipment/unequipDropdown.vue @@ -1,5 +1,6 @@ {{ $t('battleGear') }} {{ $t('costume') }} {{ $t('petAndMount') }} {{ $t('background') }} {{ $t('allItems') }} @@ -100,6 +106,14 @@ export default {