diff --git a/services/web/frontend/fonts/material-symbols.css b/services/web/frontend/fonts/material-symbols.css index f38a28e1cd..5244dc73ed 100644 --- a/services/web/frontend/fonts/material-symbols.css +++ b/services/web/frontend/fonts/material-symbols.css @@ -1,10 +1,13 @@ @font-face { font-family: 'Material Symbols Rounded'; font-style: normal; - font-weight: 100 700; + font-weight: 400; font-display: block; - src: url('material-symbols/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2') - format('woff2'); + /* + Generated from MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 with specific values: + 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 20 + */ + src: url('material-symbols/MaterialSymbolsRoundedSlice.woff2') format('woff2'); } .material-symbols { @@ -12,6 +15,7 @@ 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,10 +27,6 @@ -webkit-font-smoothing: antialiased; } -.material-symbols.material-symbols-rounded { - font-variation-settings: 'FILL' 1, 'wght' 400, 'GRAD' 0, 'opsz' 20; -} - .material-symbols-xl { font-size: 56px; } diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedSlice.woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedSlice.woff2 new file mode 100644 index 0000000000..19f6bfd6db Binary files /dev/null and b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRoundedSlice.woff2 differ diff --git a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 b/services/web/frontend/fonts/material-symbols/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 deleted file mode 100644 index 5e2d030f32..0000000000 Binary files a/services/web/frontend/fonts/material-symbols/MaterialSymbolsRounded[FILL,GRAD,opsz,wght].woff2 and /dev/null differ diff --git a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx index 39b6220f53..5ed360de9c 100644 --- a/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx +++ b/services/web/frontend/js/features/group-management/components/members-table/managed-user-status.tsx @@ -9,11 +9,7 @@ export default function ManagedUserStatus({ user }: ManagedUserStatusProps) { const { t } = useTranslation() const managedUserInvite = ( - +   {t('managed')} diff --git a/services/web/frontend/js/features/group-management/components/members-table/sso-status.tsx b/services/web/frontend/js/features/group-management/components/members-table/sso-status.tsx index 4a349d2f54..69f3a20a8a 100644 --- a/services/web/frontend/js/features/group-management/components/members-table/sso-status.tsx +++ b/services/web/frontend/js/features/group-management/components/members-table/sso-status.tsx @@ -23,11 +23,7 @@ function PendingInvite() { const { t } = useTranslation() return ( - +   {t('sso')} ) diff --git a/services/web/frontend/js/features/history/components/change-list/all-history-list.tsx b/services/web/frontend/js/features/history/components/change-list/all-history-list.tsx index a98c63a258..7c5cdfe03e 100644 --- a/services/web/frontend/js/features/history/components/change-list/all-history-list.tsx +++ b/services/web/frontend/js/features/history/components/change-list/all-history-list.tsx @@ -164,7 +164,7 @@ function AllHistoryList() { // eslint-disable-next-line react/jsx-key , , // eslint-disable-line jsx-a11y/anchor-has-content, react/jsx-key ]} diff --git a/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown-content.tsx b/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown-content.tsx index ae5e77a5b5..30aba06693 100644 --- a/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown-content.tsx +++ b/services/web/frontend/js/features/history/components/change-list/dropdown/compare-version-dropdown-content.tsx @@ -42,7 +42,7 @@ function CompareVersionDropdownContentAllHistory({ icon={ } /> @@ -58,7 +58,7 @@ function CompareVersionDropdownContentAllHistory({ icon={ } /> @@ -102,7 +102,7 @@ function CompareVersionDropdownContentLabelsList({ icon={ } /> @@ -118,7 +118,7 @@ function CompareVersionDropdownContentLabelsList({ icon={ } /> diff --git a/services/web/frontend/js/shared/components/material-icon.tsx b/services/web/frontend/js/shared/components/material-icon.tsx index 9f7a00ab26..5c78302a4b 100644 --- a/services/web/frontend/js/shared/components/material-icon.tsx +++ b/services/web/frontend/js/shared/components/material-icon.tsx @@ -1,27 +1,18 @@ import classNames from 'classnames' import React from 'react' -type IconOwnProps = { +type IconProps = React.ComponentProps<'i'> & { type: string - category?: 'rounded' | 'outlined' accessibilityLabel?: string } -type IconProps = IconOwnProps & - Omit, keyof IconOwnProps> - function MaterialIcon({ type, - category = 'rounded', className, accessibilityLabel, ...rest }: IconProps) { - const iconClassName = classNames( - 'material-symbols', - `material-symbols-${category}`, - className - ) + const iconClassName = classNames('material-symbols', className) return ( <> diff --git a/services/web/frontend/stylesheets/app/editor/history-react.less b/services/web/frontend/stylesheets/app/editor/history-react.less index 85f81ee45d..4c828f7500 100644 --- a/services/web/frontend/stylesheets/app/editor/history-react.less +++ b/services/web/frontend/stylesheets/app/editor/history-react.less @@ -380,7 +380,7 @@ history-root { background-color: @neutral-10; } - span.material-symbols-rounded { + span.material-symbols { vertical-align: middle; font-size: inherit; } diff --git a/services/web/frontend/stylesheets/app/website-redesign.less b/services/web/frontend/stylesheets/app/website-redesign.less index 0237a0aea8..2e5a282cb9 100644 --- a/services/web/frontend/stylesheets/app/website-redesign.less +++ b/services/web/frontend/stylesheets/app/website-redesign.less @@ -597,7 +597,7 @@ } } - i.material-symbols-rounded { + i.material-symbols { vertical-align: middle; text-decoration: none; } @@ -869,7 +869,7 @@ font-family: 'DM Mono', monospace; font-weight: 500; - i.material-symbols-rounded { + i.material-symbols { vertical-align: middle; padding-bottom: 3px; font-size: 24px;