diff --git a/website/client/src/assets/scss/button.scss b/website/client/src/assets/scss/button.scss index 4aae748d97..d9f9464660 100644 --- a/website/client/src/assets/scss/button.scss +++ b/website/client/src/assets/scss/button.scss @@ -154,6 +154,10 @@ } } +.show > .btn-secondary.dropdown-toggle:not(.btn-success):not(:disabled):not(.disabled) { + --icon-color: #{$purple-300}; +} + .btn-danger { background: $maroon-100; border: 1px solid transparent; diff --git a/website/client/src/assets/scss/dropdown.scss b/website/client/src/assets/scss/dropdown.scss index 0589c35853..fca1cb9e19 100644 --- a/website/client/src/assets/scss/dropdown.scss +++ b/website/client/src/assets/scss/dropdown.scss @@ -6,7 +6,7 @@ } .dropdown-toggle:hover { - --caret-color: #{$purple-200}; + --caret-color: #{$purple-300}; } .dropdown.show > .dropdown-toggle:not(.btn-success) { @@ -15,7 +15,7 @@ box-shadow: none; &::after { - --caret-color: #{$purple-200}; + --caret-color: #{$purple-300}; } } @@ -55,10 +55,14 @@ &:active, &:hover, &:focus, &.active { - background-color: rgba($purple-600, 0.25) !important; + background-color: inherit !important; color: $purple-300 !important; } + &:hover { + background-color: rgba($purple-600, 0.25) !important; + } + &.dropdown-inactive { cursor: default; @@ -126,7 +130,10 @@ height: 32px; &:active, &:hover, &:focus, &.active { - background-color: rgba($purple-600, 0.25); color: $purple-300; } + + &:hover { + background-color: rgba($purple-600, 0.25); + } } diff --git a/website/client/src/components/inventory/equipment/index.vue b/website/client/src/components/inventory/equipment/index.vue index a22db13257..ef429bfbfe 100644 --- a/website/client/src/components/inventory/equipment/index.vue +++ b/website/client/src/components/inventory/equipment/index.vue @@ -53,23 +53,22 @@ /> {{ $t('groupBy2') }} - - - {{ $t('equipmentType') }} - - - {{ $t('class') }} - - + + @@ -311,6 +310,7 @@ import Checkbox from '@/components/ui/checkbox'; import UnequipDropdown from '@/components/inventory/equipment/unequipDropdown'; import EquipBadge from '@/components/ui/equipBadge'; import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray'; +import SelectList from '@/components/ui/selectList'; const sortGearTypes = ['sortByName', 'sortByCon', 'sortByPer', 'sortByStr', 'sortByInt']; @@ -325,6 +325,7 @@ const sortGearTypeMap = { export default { name: 'Equipment', components: { + SelectList, SelectTranslatedArray, EquipBadge, UnequipDropdown, @@ -344,6 +345,9 @@ export default { searchText: null, searchTextThrottled: null, costumeMode: false, + groupByItems: [ + 'type', 'class', + ], groupBy: 'type', // or 'class' gearTypesToStrings: Object.freeze({ // TODO use content.itemList? weapon: i18n.t('weaponCapitalized'), @@ -575,6 +579,13 @@ export default { CONSTANTS.drawerStateValues.DRAWER_CLOSED, ); }, + groupByLabel (type) { + switch (type) { + case 'type': return i18n.t('equipmentType'); + case 'class': return i18n.t('class'); + default: return ''; + } + }, }, }; diff --git a/website/client/src/components/shops/quests/index.vue b/website/client/src/components/shops/quests/index.vue index 8f22454c57..150163b560 100644 --- a/website/client/src/components/shops/quests/index.vue +++ b/website/client/src/components/shops/quests/index.vue @@ -122,19 +122,14 @@
{{ $t('sortBy') }} - - - {{ $t(sort) }} - - +
@@ -474,10 +469,12 @@ import QuestInfo from './questInfo.vue'; import shops from '@/../../common/script/libs/shops'; import isPinned from '@/../../common/script/libs/isPinned'; +import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray'; export default { components: { + SelectTranslatedArray, ShopItem, Item, CountBadge, diff --git a/website/client/src/components/shops/seasonal/index.vue b/website/client/src/components/shops/seasonal/index.vue index 95d3008f92..bf59471b7b 100644 --- a/website/client/src/components/shops/seasonal/index.vue +++ b/website/client/src/components/shops/seasonal/index.vue @@ -138,19 +138,14 @@
{{ $t('sortBy') }} - - - {{ $t(sort) }} - - +
- {{ $t('sortBy') }} - - {{ $t(sort) }} - - + {{ $t('sortBy') }} +
@@ -301,9 +297,11 @@ import isPinned from '@/../../common/script/libs/isPinned'; import shops from '@/../../common/script/libs/shops'; import pinUtils from '@/mixins/pinUtils'; +import SelectTranslatedArray from '@/components/tasks/modal-controls/selectTranslatedArray'; export default { components: { + SelectTranslatedArray, ShopItem, Item, ItemRows, diff --git a/website/client/src/components/ui/filterDropdown.vue b/website/client/src/components/ui/filterDropdown.vue index 2ab05b3937..86ce4dce2f 100644 --- a/website/client/src/components/ui/filterDropdown.vue +++ b/website/client/src/components/ui/filterDropdown.vue @@ -1,35 +1,31 @@