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

Merge pull request #43 from billsonnn/patch/style-fixes

Browse Source 
fixes
This commit is contained in:
Bill 2021-12-04 23:45:10 -05:00 committed by GitHub
commit 82b9e783dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/layout/card/header/NitroCardHeaderView.scss
View File

@ -16,11 +16,6 @@
}
}
&.theme-dark {
background-color: #3d5f6e !important;
color: #fff;
}
.bg-tertiary-split {
position: relative;
border-bottom: 2px solid darken($quaternary, 5);

9
src/views/chat-history/ChatHistoryView.scss
View File

@ -2,6 +2,15 @@
width: $chat-history-width;
height: $chat-history-height;
background-color: #1C323F;
border: 2px solid rgba(255, 255, 255, 0.5);
border-radius: 0.25rem;
.nitro-card-header-container {
background-color: #3d5f6e;
color: #fff;
}
.chat-history-content {
.chat-history-container {
min-height: 200px;

2
src/views/floorplan-editor/FloorplanEditorView.scss
View File

@ -6,7 +6,7 @@
width: 100%;
height: 300px;
min-height: 300px;
overflow-x: scroll;
overflow: scroll;
}
.color {

29
src/views/floorplan-editor/common/FloorplanEditor.ts
View File

@ -43,7 +43,7 @@ export class FloorplanEditor extends PixiApplicationProxy
this._width = 0;
this._height = 0;
this._isHolding = false;
this._lastUsedTile = new NitroPoint(-1,-1);
this._lastUsedTile = new NitroPoint(-1, -1);
this._actionSettings = new ActionSettings();
}
@ -52,7 +52,7 @@ export class FloorplanEditor extends PixiApplicationProxy
if(!this._isInitialized)
{
this.loader.add('tiles', GetConfiguration<string>('floorplan.tile.url'));
this.loader.load((_, resources) =>
{
this._tilemapRenderer = new NitroTilemap(resources['tiles'].spritesheet.baseTexture);
@ -127,9 +127,8 @@ export class FloorplanEditor extends PixiApplicationProxy
const bufIndex = j + bufSize;
const data = buffer.slice(j, bufIndex);
const width = data[4];
const height = data[5];
const width = TILE_SIZE;
const height = TILE_SIZE / 2;
const mousePositionX = Math.floor(tempPoint.x);
const mousePositionY = Math.floor(tempPoint.y);
@ -137,12 +136,11 @@ export class FloorplanEditor extends PixiApplicationProxy
const tileStartX = data[2];
const tileStartY = data[3];
const centreX = tileStartX + (width / 2);
const centreY = tileStartY + (height / 2);
const dx = Math.abs(mousePositionX - centreX - 2);
const dy = Math.abs(mousePositionY - centreY - 2);
const dx = Math.abs(mousePositionX - centreX);
const dy = Math.abs(mousePositionY - centreY);
const solution = (dx / (width * 0.5) + dy / (height * 0.5) <= 1);//todo: improve this
if(solution)
@ -171,7 +169,6 @@ export class FloorplanEditor extends PixiApplicationProxy
return false;
}
private onClick(x: number, y: number): void
{
const tile = this._tilemap[y][x];
@ -212,7 +209,7 @@ export class FloorplanEditor extends PixiApplicationProxy
{
if((x + 1) > this._width) this._width = x + 1;
if( (y + 1) > this._height) this._height = y + 1;
if((y + 1) > this._height) this._height = y + 1;
}
const newHeight = HEIGHT_SCHEME[futureHeightIndex];
@ -229,7 +226,7 @@ export class FloorplanEditor extends PixiApplicationProxy
public renderTiles(): void
{
this.tilemapRenderer.clear();
for(let y = 0; y < this._tilemap.length; y++)
{
for(let x = 0; x < this.tilemap[y].length; x++)
@ -237,13 +234,13 @@ export class FloorplanEditor extends PixiApplicationProxy
const tile = this.tilemap[y][x];
let assetName = tile.height;
if(this._doorLocation.x === x && this._doorLocation.y === y)
if(this._doorLocation.x === x && this._doorLocation.y === y)
assetName = FloorplanEditor.TILE_DOOR;
if(tile.isBlocked) assetName = FloorplanEditor.TILE_BLOCKED;
//if((tile.height === 'x') || tile.height === 'X') continue;
const [positionX, positionY ] = getScreenPositionForTile(x, y);
const [positionX, positionY] = getScreenPositionForTile(x, y);
this._tilemapRenderer.tile(`${assetName}.png`, positionX, positionY);
}
}
@ -337,10 +334,10 @@ export class FloorplanEditor extends PixiApplicationProxy
if(tile.height !== 'x')
{
if( (x + 1) > this._width)
if((x + 1) > this._width)
this._width = x + 1;
if( (y + 1) > this._height)
if((y + 1) > this._height)
this._height = y + 1;
}
}

2
src/views/user-profile/views/relationships-container/RelationshipsContainerView.tsx
View File

@ -25,7 +25,7 @@ export const RelationshipsContainerView: FC<RelationshipsContainerViewProps> = p
return (
<div className="relationship-container d-flex flex-row align-items-center w-100">
<i className={`icon icon-relationship-${relationshipName} flex-shrink-0 align-self-baseline mt-2`} />
<i className={`nitro-friends-spritesheet icon-${relationshipName} flex-shrink-0 align-self-baseline mt-2`} />
<div className="w-100 d-flex flex-column">
<span className={'relationship mx-2' + (!simple ? ' advanced' : '')}>
<span className="cursor-pointer relationship-text" onClick={ event => OnUserClick(relationshipInfo)}>