diff --git a/src/App.scss b/src/App.scss index 3e1e7e2f2..9618a2ac4 100644 --- a/src/App.scss +++ b/src/App.scss @@ -411,6 +411,14 @@ nav { button:not(.button-default) { color: var(--text); font-size: 100%; + text-align: initial; + padding: 0; + background: none; + border: none; + outline: none; + display: inline; + font-family: inherit; + line-height: unset; } &.disabled { @@ -436,22 +444,6 @@ nav { --__line-height: 1.5em; --__horizontal-gap: 0.75em; --__vertical-gap: 0.5em; - - &.-non-interactive { - cursor: auto; - } - - > a, - > button:not(.button-default) { - text-align: initial; - padding: 0; - background: none; - border: none; - outline: none; - display: inline; - font-family: inherit; - line-height: unset; - } } .button-unstyled { diff --git a/src/components/block_card/block_card.vue b/src/components/block_card/block_card.vue index 90b9a2b16..be6069c14 100644 --- a/src/components/block_card/block_card.vue +++ b/src/components/block_card/block_card.vue @@ -1,5 +1,5 @@ diff --git a/src/components/confirm_modal/confirm_modal.vue b/src/components/confirm_modal/confirm_modal.vue index 1a8e0ad4e..dbd5d8697 100644 --- a/src/components/confirm_modal/confirm_modal.vue +++ b/src/components/confirm_modal/confirm_modal.vue @@ -18,7 +18,9 @@ - +
+ +
- + - + diff --git a/src/components/settings_modal/admin_tabs/frontends_tab.js b/src/components/settings_modal/admin_tabs/frontends_tab.js index ea7b970fb..9bec3d763 100644 --- a/src/components/settings_modal/admin_tabs/frontends_tab.js +++ b/src/components/settings_modal/admin_tabs/frontends_tab.js @@ -105,7 +105,7 @@ const FrontendsTab = { const ref = suggestRef || this.getSuggestedRef(frontend) const { name } = frontend - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', ':frontends', ':primary'], value: { name, ref }, }) diff --git a/src/components/settings_modal/admin_tabs/links_tab.js b/src/components/settings_modal/admin_tabs/links_tab.js index b4563576b..a6b99483b 100644 --- a/src/components/settings_modal/admin_tabs/links_tab.js +++ b/src/components/settings_modal/admin_tabs/links_tab.js @@ -112,19 +112,19 @@ const LinksTab = { }, methods: { checkRel(e) { - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', 'Pleroma.Formatter', ':rel'], value: e ? '' : false, }) }, checkClass(e) { - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', 'Pleroma.Formatter', ':class'], value: e ? '' : false, }) }, checkTruncate(e) { - useAdminSettingsStore.updateAdminDraft({ + useAdminSettingsStore().updateAdminDraft({ path: [':pleroma', 'Pleroma.Formatter', ':truncate'], value: e ? 20 : false, }) diff --git a/src/components/settings_modal/admin_tabs/users_tab.js b/src/components/settings_modal/admin_tabs/users_tab.js index c12111263..939a5a856 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.js +++ b/src/components/settings_modal/admin_tabs/users_tab.js @@ -2,13 +2,10 @@ import { isEmpty } from 'lodash' import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue' import Checkbox from 'src/components/checkbox/checkbox.vue' -import GenericConfirm from 'src/components/confirm_modal/generic_confirm.vue' import List from 'src/components/list/list.vue' import ModerationTools from 'src/components/moderation_tools/moderation_tools.vue' -import ProgressButton from 'src/components/progress_button/progress_button.vue' import Select from 'src/components/select/select.vue' -import AdminCard from 'src/components/settings_modal/admin_tabs/admin_card.vue' -import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx' +import AdminUserCard from 'src/components/settings_modal/admin_tabs/admin_user_card.vue' import { useAdminSettingsStore } from 'src/stores/admin_settings.js' @@ -18,17 +15,8 @@ const UsersTab = { Select, BasicUserCard, List, - ProgressButton, - AdminCard, - TabSwitcher, + AdminUserCard, ModerationTools, - GenericConfirm, - }, - provide() { - return { - defaultDraftMode: true, - defaultSource: 'admin', - } }, data() { return { @@ -120,12 +108,11 @@ const UsersTab = { ...this.fetchOptions, page, }) - .then(({ count, users }) => ({ count, items: users })) }, }, watch: { fetchOptions() { - this.$refs.usersList.reset() + this.$refs.usersList?.reset() }, }, } diff --git a/src/components/settings_modal/admin_tabs/users_tab.scss b/src/components/settings_modal/admin_tabs/users_tab.scss index 537e43d09..70237c189 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.scss +++ b/src/components/settings_modal/admin_tabs/users_tab.scss @@ -6,7 +6,9 @@ .filters-section { display: grid; - grid-template-columns: 1fr 1fr 1fr; + grid-template-columns: repeat(auto-fit, minmax(15em, 1fr)); + grid-auto-columns: 1fr; + grid-auto-flow: row; gap: 0.5em 1em; > div { diff --git a/src/components/settings_modal/admin_tabs/users_tab.vue b/src/components/settings_modal/admin_tabs/users_tab.vue index 1dbd7bcb0..fcc9e9df1 100644 --- a/src/components/settings_modal/admin_tabs/users_tab.vue +++ b/src/components/settings_modal/admin_tabs/users_tab.vue @@ -123,15 +123,15 @@