diff --git a/front/dist/resources/html/CustomCharacterScene.html b/front/dist/resources/html/CustomCharacterScene.html index a1c0fd2a..fae0a24b 100644 --- a/front/dist/resources/html/CustomCharacterScene.html +++ b/front/dist/resources/html/CustomCharacterScene.html @@ -6,8 +6,9 @@ margin: 10px auto 0; color: #ebeeee; overflow: auto; - width: 42vw; + width: 28vw; height: 48vh; + margin-left: -5vw; /*max-width: 300px; max-height: 48vh;*/ } @@ -98,8 +99,10 @@ } @media only screen and (max-width: 600px) { #customizeScene { - max-width: 160px; overflow-y: scroll; + margin-left: 70vw; + width: 200px; + margin-top: 20vh; } } @media only screen and (max-height: 400px) { diff --git a/front/dist/resources/html/loginScene.html b/front/dist/resources/html/loginScene.html index d189b866..b8d3757d 100644 --- a/front/dist/resources/html/loginScene.html +++ b/front/dist/resources/html/loginScene.html @@ -73,6 +73,7 @@ only screen and (max-height: 600px) { #loginScene{ overflow-y: scroll; + margin-left: 80vw; } } diff --git a/front/dist/resources/html/selectCharacterScene.html b/front/dist/resources/html/selectCharacterScene.html index ed32d386..799b4a85 100644 --- a/front/dist/resources/html/selectCharacterScene.html +++ b/front/dist/resources/html/selectCharacterScene.html @@ -5,7 +5,7 @@ border-radius: 6px; margin: 10px auto 0; color: #ebeeee; - max-height: 48vh; + max-height: 100vh; max-width: 300px; width: 40vw; overflow: hidden; @@ -29,7 +29,7 @@ #selectCharacterScene section.action { text-align: center; margin: 0; - margin-top: 28vh; + margin-top: 38vh; } #selectCharacterScene button#selectCharacterSceneFormCancel { background-color: #aca6a600; @@ -88,12 +88,19 @@ only screen and (max-height: 600px) { #selectCharacterScene{ overflow-y: scroll; + width: 70vw; + margin-left: 70vw; + margin-top: 30vw; } #selectCharacterScene section button.selectCharacterButton#selectCharacterButtonRight{ display: block; } #selectCharacterScene section button.selectCharacterButton#selectCharacterButtonLeft{ display: block; + left: auto; + } + #selectCharacterScene section button.selectCharacterButton{ + top: 40vh; } } diff --git a/front/src/index.ts b/front/src/index.ts index 2cdcaa19..4adba391 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -17,7 +17,6 @@ import {HelpCameraSettingsScene} from "./Phaser/Menu/HelpCameraSettingsScene"; import {localUserStore} from "./Connexion/LocalUserStore"; import {ErrorScene} from "./Phaser/Reconnecting/ErrorScene"; import {iframeListener} from "./Api/IframeListener"; -import { SelectCharacterMobileScene } from './Phaser/Login/SelectCharacterMobileScene'; import {HdpiManager} from "./Phaser/Services/HdpiManager"; import {waScaleManager} from "./Phaser/Services/WaScaleManager"; import {Game} from "./Phaser/Game/Game"; @@ -89,7 +88,7 @@ const config: GameConfig = { }, scene: [EntryScene, LoginScene, - isMobile() ? SelectCharacterMobileScene : SelectCharacterScene, + SelectCharacterScene, SelectCompanionScene, EnableCameraScene, ReconnectingScene, diff --git a/front/style/style.css b/front/style/style.css index c5a55cb1..a3879bb7 100644 --- a/front/style/style.css +++ b/front/style/style.css @@ -1,11 +1,3 @@ -*{ - cursor: url('./images/cursor_normal.png'), auto; -} - -* a, button, select{ - cursor: url('./images/cursor_pointer.png'), pointer; -} - body { overflow: hidden; font-size: 10px; @@ -48,7 +40,6 @@ body .message-info.warning { position: relative; transition: all 0.2s ease; height: 100%; - cursor: url('./images/cursor_pointer.png'), pointer; } .video-container i { @@ -86,7 +77,6 @@ body .message-info.warning { .video-container button.report { display: block; - cursor: url('./images/cursor_pointer.png'), pointer; background: none; background-color: rgba(0, 0, 0, 0); border: none; @@ -119,7 +109,6 @@ body .message-info.warning { left: 5px; margin: 0; padding: 0; - cursor: url('./images/cursor_pointer.png'), pointer; width: 25px; height: 25px; } @@ -130,7 +119,6 @@ body .message-info.warning { left: 36px; color: white; font-size: 16px; - cursor: url('./images/cursor_pointer.png'), pointer; } .video-container img.active { @@ -139,7 +127,6 @@ body .message-info.warning { .video-container video { height: 100%; - cursor: url('./images/cursor_pointer.png'), pointer; } .video-container video:focus { @@ -227,7 +214,6 @@ video#myCamVideo { /*btn animation*/ .btn-cam-action div{ - cursor: url('./images/cursor_pointer.png'), pointer; /*position: absolute;*/ width: 44px; height: 44px; @@ -285,7 +271,6 @@ video#myCamVideo { height: 22px; width: auto; position: relative; - cursor: url('./images/cursor_pointer.png'), pointer; pointer-events: all; } @@ -639,7 +624,6 @@ input[type=range]:focus::-ms-fill-upper { margin: 2%; flex-basis: 96%; transition: margin-left 0.2s, margin-right 0.2s, margin-bottom 0.2s, margin-top 0.2s, flex-basis 0.2s; - cursor: url('./images/cursor_pointer.png'), pointer; pointer-events: auto; /*flex-shrink: 2;*/ } @@ -657,7 +641,6 @@ input[type=range]:focus::-ms-fill-upper { .sidebar>div { margin: 2%; transition: margin-left 0.2s, margin-right 0.2s, margin-bottom 0.2s, margin-top 0.2s, max-height 0.2s, max-width 0.2s; - cursor: url('./images/cursor_pointer.png'), pointer; pointer-events: auto; } @@ -665,11 +648,6 @@ input[type=range]:focus::-ms-fill-upper { margin: 0%; } -.sidebar > div video { - cursor: url('./images/cursor_pointer.png'), pointer; -} - - /* Let's make sure videos are vertically centered if they need to be cropped */ .media-container { @@ -690,7 +668,6 @@ input[type=range]:focus::-ms-fill-upper { margin: 1%; max-height: 96%; transition: margin-left 0.2s, margin-right 0.2s, margin-bottom 0.2s, margin-top 0.2s; - cursor: url('./images/cursor_pointer.png'), pointer; } .chat-mode>div:hover { @@ -782,7 +759,6 @@ input[type=range]:focus::-ms-fill-upper { margin-top: 6px; width: 30px; height: 30px; - cursor: url('./images/cursor_pointer.png'), pointer; padding: 0 5px; transition: all .5s ease; transform: rotateY(0); @@ -807,7 +783,6 @@ input[type=range]:focus::-ms-fill-upper { .main-console div.console:hover, .message-container div.clear:hover { - cursor: url('./images/cursor_pointer.png'), pointer; top: calc(100% + 5px); transform: scale(1.2) translateY(3px); } @@ -840,7 +815,6 @@ input[type=range]:focus::-ms-fill-upper { transition: all .2s ease; } .main-console .btn-action .btn:hover{ - cursor: url('./images/cursor_pointer.png'), pointer; background-color: #ffda01; color: black; border: 1px solid black; @@ -855,7 +829,6 @@ input[type=range]:focus::-ms-fill-upper { .main-console .menu span { margin: 20px; - cursor: url('./images/cursor_pointer.png'), pointer; } .main-console .menu span.active { @@ -891,10 +864,6 @@ input[type=range]:focus::-ms-fill-upper { .main-console section div.upload label img { height: 150px; - cursor: url('./images/cursor_pointer.png'), pointer; -} -.main-console section div.upload label img{ - cursor: url('./images/cursor_pointer.png'), pointer; } @@ -995,7 +964,6 @@ div.modal-report-user { right: 0; left: auto; top: 0; - cursor: url('./images/cursor_pointer.png'), pointer; width: 15px; height: 15px; margin: 10px; @@ -1014,7 +982,6 @@ div.modal-report-user { transition: all .2s ease; } .modal-report-user button:hover{ - cursor: url('./images/cursor_pointer.png'), pointer; background-color: #ffda01; color: black; border: 1px solid black; @@ -1062,7 +1029,6 @@ div.modal-report-user { .discussion .active-btn { display: none; - cursor: url('./images/cursor_pointer.png'), pointer; height: 50px; width: 50px; background-color: #2d2d2dba; @@ -1094,7 +1060,6 @@ div.modal-report-user { right: 10px; background: none; border: none; - cursor: url('./images/cursor_pointer.png'), pointer; } .discussion .close-btn img { @@ -1120,7 +1085,6 @@ div.modal-report-user { background-color: #ffffff69; padding: 5px; border-radius: 15px; - cursor: url('./images/cursor_pointer.png'), pointer; } .discussion .participants .participant:hover { @@ -1154,7 +1118,6 @@ div.modal-report-user { } .discussion .participants .participant button.report-btn{ - cursor: url('./images/cursor_pointer.png'), pointer; position: absolute; background-color: #2d2d2dba; right: 34px; @@ -1272,7 +1235,6 @@ div.action.danger { animation-timing-function: ease-in-out; } div.action p.action-body{ - cursor: url('./images/cursor_pointer.png'), pointer; padding: 10px; font-size: 12px; font-weight: 500;