From 7cc1e5b2c696d2bd3a49b8dc0f131d8217ef9b92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Mon, 17 May 2021 16:16:18 +0200 Subject: [PATCH] Moving styles out of the "dist/" directory --- front/src/index.ts | 2 +- .../style/cowebsite-mobile.scss | 0 .../{dist/resources => }/style/cowebsite.scss | 2 +- .../logos => style/images}/cursor_normal.png | Bin .../logos => style/images}/cursor_pointer.png | Bin front/{dist/resources => }/style/index.scss | 0 .../resources => }/style/mobile-style.scss | 0 front/{dist/resources => }/style/style.css | 52 +++++++++--------- 8 files changed, 28 insertions(+), 28 deletions(-) rename front/{dist/resources => }/style/cowebsite-mobile.scss (100%) rename front/{dist/resources => }/style/cowebsite.scss (95%) rename front/{dist/resources/logos => style/images}/cursor_normal.png (100%) rename front/{dist/resources/logos => style/images}/cursor_pointer.png (100%) rename front/{dist/resources => }/style/index.scss (100%) rename front/{dist/resources => }/style/mobile-style.scss (100%) rename front/{dist/resources => }/style/style.css (93%) diff --git a/front/src/index.ts b/front/src/index.ts index cb0425a8..ceb19d90 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -1,6 +1,6 @@ import 'phaser'; import GameConfig = Phaser.Types.Core.GameConfig; -import "../dist/resources/style/index.scss"; +import "../style/index.scss"; import {DEBUG_MODE, isMobile} from "./Enum/EnvironmentVariable"; import {LoginScene} from "./Phaser/Login/LoginScene"; diff --git a/front/dist/resources/style/cowebsite-mobile.scss b/front/style/cowebsite-mobile.scss similarity index 100% rename from front/dist/resources/style/cowebsite-mobile.scss rename to front/style/cowebsite-mobile.scss diff --git a/front/dist/resources/style/cowebsite.scss b/front/style/cowebsite.scss similarity index 95% rename from front/dist/resources/style/cowebsite.scss rename to front/style/cowebsite.scss index f834e122..2ed1ef69 100644 --- a/front/dist/resources/style/cowebsite.scss +++ b/front/style/cowebsite.scss @@ -32,7 +32,7 @@ position: absolute; background: none; border: none; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; img { height: 25px; diff --git a/front/dist/resources/logos/cursor_normal.png b/front/style/images/cursor_normal.png similarity index 100% rename from front/dist/resources/logos/cursor_normal.png rename to front/style/images/cursor_normal.png diff --git a/front/dist/resources/logos/cursor_pointer.png b/front/style/images/cursor_pointer.png similarity index 100% rename from front/dist/resources/logos/cursor_pointer.png rename to front/style/images/cursor_pointer.png diff --git a/front/dist/resources/style/index.scss b/front/style/index.scss similarity index 100% rename from front/dist/resources/style/index.scss rename to front/style/index.scss diff --git a/front/dist/resources/style/mobile-style.scss b/front/style/mobile-style.scss similarity index 100% rename from front/dist/resources/style/mobile-style.scss rename to front/style/mobile-style.scss diff --git a/front/dist/resources/style/style.css b/front/style/style.css similarity index 93% rename from front/dist/resources/style/style.css rename to front/style/style.css index a90318b3..d95ac701 100644 --- a/front/dist/resources/style/style.css +++ b/front/style/style.css @@ -1,9 +1,9 @@ *{ font-family: 'Open Sans', sans-serif; - cursor: url('../logos/cursor_normal.png'), auto; + cursor: url('./images/cursor_normal.png'), auto; } * a, button, select{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } body{ overflow: hidden; @@ -39,7 +39,7 @@ body .message-info.warning{ position: relative; transition: all 0.2s ease; background-color: #00000099; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .video-container i{ position: absolute; @@ -75,7 +75,7 @@ body .message-info.warning{ .video-container button.report{ display: block; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; background: none; background-color: rgba(0, 0, 0, 0); border: none; @@ -108,7 +108,7 @@ body .message-info.warning{ left: 5px; margin: 0; padding: 0; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; width: 25px; height: 25px; } @@ -118,7 +118,7 @@ body .message-info.warning{ left: 36px; color: white; font-size: 16px; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .video-container img.active { display: block !important; @@ -126,7 +126,7 @@ body .message-info.warning{ .video-container video{ height: 100%; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .video-container video:focus{ @@ -206,7 +206,7 @@ video#myCamVideo{ } /*btn animation*/ .btn-cam-action div{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; /*position: absolute;*/ border: solid 0px black; width: 44px; @@ -260,7 +260,7 @@ video#myCamVideo{ top: calc(48px - 37px); left: calc(48px - 41px); position: relative; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } /* Spinner */ @@ -572,7 +572,7 @@ 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('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; pointer-events: auto; /*flex-shrink: 2;*/ } @@ -590,7 +590,7 @@ 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('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; border-radius: 15px 15px 15px 15px; pointer-events: auto; } @@ -600,7 +600,7 @@ input[type=range]:focus::-ms-fill-upper { } .sidebar > div video { - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } /* Let's make sure videos are vertically centered if they need to be cropped */ @@ -625,7 +625,7 @@ 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('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .chat-mode > div:hover { @@ -715,7 +715,7 @@ input[type=range]:focus::-ms-fill-upper { margin-top: 6px; width: 30px; height: 30px; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; padding: 0 5px; transition: all .5s ease; transform: rotateY(0); @@ -739,7 +739,7 @@ input[type=range]:focus::-ms-fill-upper { .main-console div.console:hover, .message-container div.clear:hover { - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; top: calc(100% + 5px); transform: scale(1.2) translateY(3px); } @@ -772,7 +772,7 @@ input[type=range]:focus::-ms-fill-upper { transition: all .2s ease; } .main-console .btn-action .btn:hover{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; background-color: #ffda01; color: black; border: 1px solid black; @@ -787,7 +787,7 @@ input[type=range]:focus::-ms-fill-upper { .main-console .menu span { margin: 20px; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .main-console .menu span.active { @@ -821,10 +821,10 @@ input[type=range]:focus::-ms-fill-upper { } .main-console section div.upload label img{ height: 150px; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .main-console section div.upload label img{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } @@ -917,7 +917,7 @@ div.modal-report-user{ right: 0; left: auto; top: 0; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; width: 15px; height: 15px; margin: 10px; @@ -936,7 +936,7 @@ div.modal-report-user{ transition: all .2s ease; } .modal-report-user button:hover{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; background-color: #ffda01; color: black; border: 1px solid black; @@ -979,7 +979,7 @@ div.modal-report-user{ } .discussion .active-btn{ display: none; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; height: 50px; width: 50px; background-color: #2d2d2dba; @@ -1008,7 +1008,7 @@ div.modal-report-user{ right: 10px; background: none; border: none; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .discussion .close-btn img{ height: 15px; @@ -1033,7 +1033,7 @@ div.modal-report-user{ background-color: #ffffff69; padding: 5px; border-radius: 15px; - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; } .discussion .participants .participant:hover{ @@ -1066,7 +1066,7 @@ div.modal-report-user{ } .discussion .participants .participant button.report-btn{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; position: absolute; background-color: #2d2d2dba; right: 34px; @@ -1176,7 +1176,7 @@ div.action.danger{ animation-timing-function: ease-in-out; } div.action p.action-body{ - cursor: url('../logos/cursor_pointer.png'), pointer; + cursor: url('./images/cursor_pointer.png'), pointer; padding: 10px; background-color: #2d2d2dba; color: #fff;