diff --git a/web/settings/relationship/add-friends-modal.react.js b/web/settings/relationship/add-friends-modal.react.js index 51f2bc803..cac0dd8a1 100644 --- a/web/settings/relationship/add-friends-modal.react.js +++ b/web/settings/relationship/add-friends-modal.react.js @@ -1,31 +1,31 @@ // @flow import * as React from 'react'; import { relationshipActions, userRelationshipStatus, } from 'lib/types/relationship-types.js'; import AddUsersListModal from './add-users-list-modal.react.js'; const excludedStatuses = new Set([ userRelationshipStatus.FRIEND, userRelationshipStatus.BLOCKED_VIEWER, userRelationshipStatus.BOTH_BLOCKED, userRelationshipStatus.REQUEST_SENT, userRelationshipStatus.REQUEST_RECEIVED, ]); function AddFriendsModal(): React.Node { return ( ); } export default AddFriendsModal; diff --git a/web/settings/relationship/add-users-list.css b/web/settings/relationship/add-users-list.css index d3f14c2d9..d095f4958 100644 --- a/web/settings/relationship/add-users-list.css +++ b/web/settings/relationship/add-users-list.css @@ -1,77 +1,77 @@ .container { - height: 625px; + height: 60vh; display: flex; flex-direction: column; } -.userRowsContainer { - overflow: auto; +.scrollContainer { + overflow-y: scroll; display: flex; flex-direction: column; flex: 1; } .userListItemContainer { display: flex; color: var(--relationship-modal-color); font-size: var(--l-font-18); line-height: var(--line-height-display); padding: 8px; } .userListItemContainer:hover { cursor: pointer; background-color: var(--listItem-background-primary-hover); border-radius: 8px; } .avatarContainer { margin: 0 8px 0 16px; } .username { color: var(--text-background-secondary-default); white-space: nowrap; overflow: hidden; text-overflow: ellipsis; } .selectedUsername { color: var(--text-background-primary-default); } .confirmButtonContainer { display: flex; flex-direction: column; align-items: center; } .hidden { visibility: hidden; height: 0; } .error { padding-bottom: 8px; font-size: var(--s-font-14); line-height: var(--line-height-display); color: var(--error); padding-left: 6px; font-style: italic; } .listHeaderContainer { display: flex; justify-content: space-between; margin: 16px 8px 8px; } .selectionText { color: var(--text-background-secondary-default); } .previouslySelectedUsersContainer { border-bottom: 1px solid var(--separator-background-primary-default); padding-bottom: 8px; margin-bottom: 8px; } diff --git a/web/settings/relationship/block-users-modal.react.js b/web/settings/relationship/block-users-modal.react.js index 005db1fbf..e98f6782c 100644 --- a/web/settings/relationship/block-users-modal.react.js +++ b/web/settings/relationship/block-users-modal.react.js @@ -1,39 +1,39 @@ // @flow import { faUserShield } from '@fortawesome/free-solid-svg-icons'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import * as React from 'react'; import { relationshipActions, userRelationshipStatus, } from 'lib/types/relationship-types.js'; import AddUsersListModal from './add-users-list-modal.react.js'; import { buttonThemes } from '../../components/button.react.js'; const excludedStatuses = new Set([ userRelationshipStatus.BOTH_BLOCKED, userRelationshipStatus.BLOCKED_BY_VIEWER, ]); function BlockUsersModal(): React.Node { const buttonContent = (
- {' Block Users'} + {' Block users'}
); return ( ); } export default BlockUsersModal;