From 0c5ba1e96e2064ddeca92b7a205bf81a9f142a47 Mon Sep 17 00:00:00 2001 From: Alexandre Bourdin Date: Fri, 25 Aug 2023 10:51:45 +0200 Subject: [PATCH] Merge pull request #14491 from overleaf/ab-update-managed-users-icons [web] Update managed users icons and improve display on smaller screen sizes GitOrigin-RevId: 7b6263ea9afa9bb52bed3a3f50cbe361e7064085 --- .../web/frontend/fonts/material-symbols.css | 7 +- .../managed-users/managed-user-row.tsx | 139 +++++++++--------- .../managed-users/managed-user-status.tsx | 23 ++- .../managed-users/managed-users-list.tsx | 109 +++++++------- .../dropdown/compare-version-dropdown.tsx | 2 +- .../dropdown/menu-item/compare-items.tsx | 4 +- .../js/shared/components/material-icon.tsx | 9 +- .../stylesheets/components/group-members.less | 115 +++++++++++++++ .../stylesheets/modules/managed-users.less | 4 - .../managed-group-members.spec.tsx | 54 +++---- .../managed-users/managed-user-row.spec.tsx | 12 +- 11 files changed, 302 insertions(+), 176 deletions(-) diff --git a/services/web/frontend/fonts/material-symbols.css b/services/web/frontend/fonts/material-symbols.css index d63fc98598..bdb20dbffd 100644 --- a/services/web/frontend/fonts/material-symbols.css +++ b/services/web/frontend/fonts/material-symbols.css @@ -7,12 +7,11 @@ format('woff2'); } -.material-symbols-rounded { +.material-symbols { font-family: 'Material Symbols Rounded'; font-weight: normal; font-style: normal; font-size: 20px; - font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 20; line-height: 1; letter-spacing: normal; text-transform: none; @@ -23,3 +22,7 @@ font-feature-settings: 'liga'; -webkit-font-smoothing: antialiased; } + +.material-symbols.material-symbols-rounded { + font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 20; +} diff --git a/services/web/frontend/js/features/group-management/components/managed-users/managed-user-row.tsx b/services/web/frontend/js/features/group-management/components/managed-users/managed-user-row.tsx index d49aae0ed3..53aad7b921 100644 --- a/services/web/frontend/js/features/group-management/components/managed-users/managed-user-row.tsx +++ b/services/web/frontend/js/features/group-management/components/managed-users/managed-user-row.tsx @@ -1,6 +1,5 @@ import moment from 'moment' import { type Dispatch, type SetStateAction, useCallback } from 'react' -import { Col, Row } from 'react-bootstrap' import { useTranslation } from 'react-i18next' import { User } from '../../../../../../types/group-management/user' import Badge from '../../../../shared/components/badge' @@ -40,78 +39,76 @@ export default function ManagedUserRow({ const selected = selectedUsers.includes(user) return ( -
  • - - - - handleSelectUser(e, user)} - /> - - {user.email} - {user.invite ? ( - -   - - - {t('pending_invite')} - - - - ) : ( - '' - )} - {user.isEntityAdmin && ( - -   - -