nitro/nitro-react
1
0
Fork 0
mirror of https://github.com/billsonnn/nitro-react.git synced 2024-11-30 08:50:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://git.krews.org/nitro/nitro-react into dev

Browse Source
This commit is contained in:
Bill 2022-03-17 13:57:29 -04:00
commit a1358dccbc
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/App.scss
View File

@ -30,8 +30,8 @@ $catalog-height: 400px;
$inventory-width: 528px; $inventory-width: 528px;
$inventory-height: 320px; $inventory-height: 320px;
$navigator-width: 430px; $navigator-width: 420px;
$navigator-height: 420px; $navigator-height: 440px;
$chat-input-style-selector-widget-width: 210px; $chat-input-style-selector-widget-width: 210px;
$chat-input-style-selector-widget-height: 200px; $chat-input-style-selector-widget-height: 200px;

1
src/components/navigator/NavigatorView.scss
View File

@ -1,5 +1,4 @@
.nitro-navigator { .nitro-navigator {
min-width: $navigator-width;
width: $navigator-width; width: $navigator-width;
height: $navigator-height; height: $navigator-height;

4
src/components/navigator/views/search-result/NavigatorSearchResultItemView.tsx
View File

@ -71,8 +71,8 @@ export const NavigatorSearchResultItemView: FC<NavigatorSearchResultItemViewProp
} }
if(thumbnail) return ( if(thumbnail) return (
<Flex pointer overflow="hidden" column={ true } alignItems="center" onClick={visitRoom} gap={2} className="navigator-item p-2 bg-muted rounded-3 small mx-1 mb-1 flex-column" {...rest}> <Flex pointer overflow="hidden" column={ true } alignItems="center" onClick={visitRoom} gap={0} className="navigator-item p-1 bg-light rounded-3 small mb-1 flex-column border border-muted" {...rest}>
<LayoutRoomThumbnailView roomId={roomData.roomId} customUrl={roomData.officialRoomPicRef} className="d-flex flex-column align-items-center justify-content-end w-100"> <LayoutRoomThumbnailView roomId={roomData.roomId} customUrl={roomData.officialRoomPicRef} className="d-flex flex-column align-items-center justify-content-end mb-1">
<LayoutBadgeImageView badgeCode={roomData.groupBadgeCode} isGroup={true} className={ 'position-absolute top-0 start-0 m-1' } /> <LayoutBadgeImageView badgeCode={roomData.groupBadgeCode} isGroup={true} className={ 'position-absolute top-0 start-0 m-1' } />
<Flex center className={ 'badge p-1 position-absolute m-1 ' + getUserCounterColor() } gap={ 1 }> <Flex center className={ 'badge p-1 position-absolute m-1 ' + getUserCounterColor() } gap={ 1 }>
<FontAwesomeIcon icon="user" /> <FontAwesomeIcon icon="user" />

2
src/components/navigator/views/search-result/NavigatorSearchResultView.tsx
View File

@ -67,7 +67,7 @@ export const NavigatorSearchResultView: FC<NavigatorSearchResultViewProps> = pro
</Flex> {isExtended && </Flex> {isExtended &&
<> <>
{ {
gridHasTwoColumns ? <AutoGrid columnCount={3} {...rest} columnMinWidth={110} columnMinHeight={130}> gridHasTwoColumns ? <AutoGrid columnCount={3} {...rest} columnMinWidth={110} columnMinHeight={130} className="mx-2">
{searchResult.rooms.length > 0 && searchResult.rooms.map((room, index) => <NavigatorSearchResultItemView key={index} roomData={room} thumbnail={ true } />) } {searchResult.rooms.length > 0 && searchResult.rooms.map((room, index) => <NavigatorSearchResultItemView key={index} roomData={room} thumbnail={ true } />) }
</AutoGrid> : <Grid columnCount={ 1 } className='navigator-grid' gap={ 0 }> </AutoGrid> : <Grid columnCount={ 1 } className='navigator-grid' gap={ 0 }>
{ searchResult.rooms.length > 0 && searchResult.rooms.map((room, index) => <NavigatorSearchResultItemView key={ index } roomData={ room } />) } { searchResult.rooms.length > 0 && searchResult.rooms.map((room, index) => <NavigatorSearchResultItemView key={ index } roomData={ room } />) }