noby
/
workadventure
2
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #889 from thecodingmachine/HotFixStyle 

HotFix style WorkAdventure
This commit is contained in:
grégoire parant 2021-04-12 19:30:06 +02:00 committed by GitHub
parent 5ad7787cd5 6a08ca656f
commit 2a6221afe2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
front/dist/resources/html/gameMenuIcon.html vendored
View File

@ -8,7 +8,7 @@
} }
#menuIcon button img{ #menuIcon button img{
width: 14px; width: 14px;
padding-top: 3px; padding-top: 0;
cursor: url('/resources/logos/cursor_pointer.png'), pointer; cursor: url('/resources/logos/cursor_pointer.png'), pointer;
} }
#menuIcon section { #menuIcon section {

39
front/dist/resources/style/style.css vendored
View File

@ -44,13 +44,13 @@ body .message-info.warning{
.video-container i{ .video-container i{
position: absolute; position: absolute;
width: 100px; width: 100px;
height: 65px; height: 100px;
left: calc(50% - 50px); left: calc(50% - 50px);
top: calc(50% - 50px); top: calc(50% - 50px);
background-color: black; background-color: black;
border-radius: 50%; border-radius: 50%;
text-align: center; text-align: center;
padding-top: 35px; padding-top: 32px;
font-size: 28px; font-size: 28px;
color: white; color: white;
} }
@ -58,8 +58,8 @@ body .message-info.warning{
.video-container img{ .video-container img{
position: absolute; position: absolute;
display: none; display: none;
width: 25px; width: 40px;
height: 25px; height: 40px;
left: 5px; left: 5px;
bottom: 5px; bottom: 5px;
padding: 10px; padding: 10px;
@ -108,10 +108,12 @@ body .message-info.warning{
margin: 0; margin: 0;
padding: 0; padding: 0;
cursor: url('/resources/logos/cursor_pointer.png'), pointer; cursor: url('/resources/logos/cursor_pointer.png'), pointer;
width: 25px;
height: 25px;
} }
.video-container button.report span{ .video-container button.report span{
position: absolute; position: absolute;
bottom: 8px; bottom: 6px;
left: 36px; left: 36px;
color: white; color: white;
font-size: 16px; font-size: 16px;
@ -211,8 +213,8 @@ video#myCamVideo{
.connecting-spinner { .connecting-spinner {
/*display: inline-block;*/ /*display: inline-block;*/
position: absolute; position: absolute;
left: calc(50% - 68px); left: calc(50% - 62px);
top: calc(50% - 68px); top: calc(50% - 62px);
width: 130px; width: 130px;
@ -850,10 +852,10 @@ div.modal-report-user{
.modal-report-user img{ .modal-report-user img{
position: absolute; position: absolute;
height: 50px; height: 24px;
width: 50px; width: 24px;
z-index: 999; z-index: 999;
left: calc(50% - 25px); left: calc(50% - 12px);
top: 10px; top: 10px;
} }
@ -1017,7 +1019,7 @@ div.modal-report-user{
background-color: #2d2d2dba; background-color: #2d2d2dba;
right: 34px; right: 34px;
margin: 0px; margin: 0px;
padding: 6px 0px; padding: 2px 0px;
border-radius: 15px; border-radius: 15px;
border: none; border: none;
color: white; color: white;
@ -1073,18 +1075,18 @@ div.modal-report-user{
.discussion .send-message{ .discussion .send-message{
position: absolute; position: absolute;
bottom: 45px; bottom: 45px;
width: 220px; width: 200px;
height: 26px; height: 26px;
margin-bottom: 10px; margin-bottom: 10px;
} }
.discussion .send-message input{ .discussion .send-message input{
position: absolute; position: absolute;
width: calc(100% - 10px); width: calc(100% - 20px);
height: 20px; height: 30px;
background-color: #171717; background-color: #171717;
color: white; color: white;
border-radius: 15px; border-radius: 10px;
border: none; border: none;
padding: 6px; padding: 6px;
} }
@ -1117,10 +1119,11 @@ div.action p.action-body{
padding: 10px; padding: 10px;
background-color: #2d2d2dba; background-color: #2d2d2dba;
color: #fff; color: #fff;
font-size: 12px; font-size: 14px;
font-weight: 500;
text-align: center; text-align: center;
max-width: 150px; max-width: 250px;
margin-left: calc(50% - 75px); margin-left: calc(50% - 125px);
border-radius: 15px; border-radius: 15px;
} }
.popUpElement{ .popUpElement{

7
front/src/Phaser/Menu/MenuScene.ts
View File

@ -104,7 +104,12 @@ export class MenuScene extends Phaser.Scene {
} }
public revealMenuIcon(): void { public revealMenuIcon(): void {
(this.menuButton.getChildByID('menuIcon') as HTMLElement).hidden = false //TODO fix me: add try catch because at the same time, 'this.menuButton' variable doesn't exist and there is error on 'getChildByID' function
try {
(this.menuButton.getChildByID('menuIcon') as HTMLElement).hidden = false;
} catch (err) {
console.error(err);
}
} }
openSideMenu() { openSideMenu() {

2
front/src/Phaser/Menu/ReportMenu.ts
View File

@ -72,8 +72,8 @@ export class ReportMenu extends Phaser.GameObjects.DOMElement {
} }
public close(): void { public close(): void {
gameManager.getCurrentGameScene(this.scene).userInputManager.restoreControls();
this.opened = false; this.opened = false;
gameManager.getCurrentGameScene(this.scene).userInputManager.initKeyBoardEvent();
const mainEl = this.getChildByID('gameReport') as HTMLElement; const mainEl = this.getChildByID('gameReport') as HTMLElement;
this.scene.tweens.add({ this.scene.tweens.add({
targets: this, targets: this,