nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2025-01-18 13:26:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/billsonnn/nitro-react into dev

Browse Source
This commit is contained in:
Bill 2021-09-06 02:58:13 -04:00
commit b4c69fba43
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/groups/views/members/GroupMembersView.scss
View File

@ -7,8 +7,6 @@
}
.members-list {
height: 300px;
.list-member {
border: 1px solid #ced4da;

2
src/views/groups/views/members/GroupMembersView.tsx
View File

@ -22,7 +22,7 @@ export const GroupMembersView: FC<GroupMembersViewProps> = props =>
{
if(!groupId) return;
SendMessageHook(new GroupMembersComposer(groupId, pageId, searchQuery, newLevelId !== null ? newLevelId : searchLevelId));
SendMessageHook(new GroupMembersComposer(groupId, pageId, searchQuery, newLevelId !== undefined ? newLevelId : searchLevelId));
}, [ groupId, searchQuery, searchLevelId ]);
const onGroupMembersEvent = useCallback((event: GroupMembersEvent) =>

2
src/views/room/widgets/context-menu/ContextMenu.scss
View File

@ -34,6 +34,8 @@
.menu-header {
background-color: $william;
color: $white;
width: 117px;
max-width: 117px;
height: 25px;
max-height: 25px;
font-size: 16px;

2
src/views/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx
View File

@ -183,7 +183,7 @@ export const FurnitureContextMenuView: FC<{}> = props =>
</> }
{ (mode === GROUP_FURNITURE) && groupData &&
<>
<ContextMenuHeaderView className="cursor-pointer" onClick={ () => GetGroupInformation(groupData.guildId) }>
<ContextMenuHeaderView className="cursor-pointer text-truncate" onClick={ () => GetGroupInformation(groupData.guildId) }>
{ groupData.guildName }
</ContextMenuHeaderView>
{ !isGroupMember && <ContextMenuListItemView onClick={ event => processAction('join_group') }>

2
src/views/room/widgets/infostand/views/user/InfoStandWidgetUserView.tsx
View File

@ -125,7 +125,7 @@ export const InfoStandWidgetUserView: FC<InfoStandWidgetUserViewProps> = props =
</div>
<hr className="m-0 my-1" />
<div className="bg-light-dark rounded py-1 px-2 small">
{ userData.type !== RoomWidgetUpdateInfostandUserEvent.OWN_USER && <div className="motto-content">{ motto }</div> }
{ userData.type !== RoomWidgetUpdateInfostandUserEvent.OWN_USER && <div className="motto-content w-100 text-wrap text-break">{ motto }</div> }
{ userData.type === RoomWidgetUpdateInfostandUserEvent.OWN_USER &&
<div className="d-flex justify-content-between align-items-center">
<i className="small fas fa-pencil-alt me-2"></i>