diff --git a/changelog.d/user-management.add b/changelog.d/user-management.add index ccd217f19..28dfc2220 100644 --- a/changelog.d/user-management.add +++ b/changelog.d/user-management.add @@ -1 +1 @@ -User administration + post scope/sensitivity admin change support +user management (view and modify user info, view and modify user statuses) diff --git a/src/App.scss b/src/App.scss index 3e1e7e2f2..952af5b47 100644 --- a/src/App.scss +++ b/src/App.scss @@ -418,6 +418,45 @@ nav { } } +.list-item { + border-color: var(--border); + border-style: solid; + border-width: 0; + border-top-width: 1px; + + &.-active, + &:hover { + border-top-width: 1px; + border-bottom-width: 1px; + } + + &.-active + &, + &:hover + & { + border-top-width: 0; + } + + &:hover + .menu-item-collapsible:not(.-expanded) + &, + &.-active + .menu-item-collapsible:not(.-expanded) + & { + border-top-width: 0; + } + + &[aria-expanded="true"] { + border-bottom-width: 1px; + } + + &:first-child { + border-top-right-radius: var(--roundness); + border-top-left-radius: var(--roundness); + border-top-width: 0; + } + + &:last-child { + border-bottom-right-radius: var(--roundness); + border-bottom-left-radius: var(--roundness); + border-bottom-width: 0; + } +} + .menu-item, .list-item { display: block; @@ -441,8 +480,8 @@ nav { cursor: auto; } - > a, - > button:not(.button-default) { + a, + button:not(.button-default) { text-align: initial; padding: 0; background: none; diff --git a/src/components/list/list.css b/src/components/list/list.css index c478e9bc4..84b737ed2 100644 --- a/src/components/list/list.css +++ b/src/components/list/list.css @@ -14,22 +14,6 @@ display: flex; align-items: center; - &[aria-expanded="true"] { - border-bottom-width: 1px; - } - - &:first-child { - border-top-right-radius: var(--roundness); - border-top-left-radius: var(--roundness); - border-top-width: 0; - } - - &:last-child { - border-bottom-right-radius: var(--roundness); - border-bottom-left-radius: var(--roundness); - border-bottom-width: 0; - } - &:not(:last-child) { border-bottom: 1px dotted var(--border); } diff --git a/src/components/settings_modal/tabs/notifications_tab.js b/src/components/settings_modal/tabs/notifications_tab.js index 5114012a8..c863a7b9f 100644 --- a/src/components/settings_modal/tabs/notifications_tab.js +++ b/src/components/settings_modal/tabs/notifications_tab.js @@ -21,7 +21,7 @@ const NotificationsTab = { if (!this.user) { return false } - return this.user.privileges.has('reports_manage_reports') + return this.user.privileges.includes('reports_manage_reports') }, ...SharedComputedObject(), }, diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index 5ab1fa18e..85fc84ff9 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -188,12 +188,11 @@ const PLEROMA_ADMIN_RESEND_CONFIRMATION_EMAIL_URL = '/api/v1/pleroma/admin/users/resend_confirmation_email' const PLEROMA_ADMIN_LIST_STATUSES_URL = ({ id, - page, pageSize, godmode, withReblogs, }) => - `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&page=${page}&godmode=${godmode}&with_reblogs=${withReblogs}` + `/api/v1/pleroma/admin/users/${id}/statuses?page_size=${pageSize}&godmode=${godmode}&with_reblogs=${withReblogs}` const PLEROMA_ADMIN_CHANGE_STATUS_SCOPE_URL = (id) => `/api/v1/pleroma/admin/statuses/${id}` const PLEROMA_ADMIN_REQUIRE_PASSWORD_CHANGE_URL =