Merge branch 'develop' of github.com:thecodingmachine/workadventure

This commit is contained in:
_Bastler
2021-11-16 10:56:33 +01:00
49 changed files with 755 additions and 489 deletions
+1 -1
View File
@@ -21,7 +21,7 @@
}
aside {
background: #212529;
background: gray;
align-items: center;
display: flex;
flex-direction: column;
+2 -1
View File
@@ -1,8 +1,9 @@
@import "~nes.css/css/nes.min.css";
@import "nes.custom.css";
@import "quill.snow.css";
@import "cowebsite.scss";
@import "cowebsite-mobile.scss";
@import "style";
@import "mobile-style.scss";
@import "fonts.scss";
@import "quill.snow.css";
@import "TextGlobalMessageSvelte-Style";
+100 -152
View File
@@ -8,8 +8,7 @@ body img:focus,
body input:focus {
outline: -webkit-focus-ring-color auto 0;
}
body .message-info {
body .message-info{
width: 20%;
height: auto;
min-height: 30px;
@@ -19,20 +18,17 @@ body .message-info {
padding-top: 10px;
text-align: center;
}
body .message-info.error {
body .message-info.error{
background: red;
}
body .message-info.success {
body .message-info.success{
background: green;
}
body .message-info.info {
body .message-info.info{
background: dodgerblue;
}
body .message-info.warning {
body .message-info.warning{
background: #ffa500d6;
}
@@ -161,18 +157,16 @@ video.myCamVideo{
/*height: 113px;*/
}
.sound-progress {
.sound-progress{
display: none;
position: absolute;
right: 14px;
top: calc(50% - 5px);
}
.sound-progress.active {
.sound-progress.active{
display: table-column;
}
.sound-progress span {
.sound-progress span{
position: absolute;
color: black;
background-color: #00000020;
@@ -180,28 +174,22 @@ video.myCamVideo{
height: 5px;
border-radius: 50%;
}
.sound-progress span.active {
.sound-progress span.active{
background-color: #00c3ff66
}
.sound-progress span:nth-child(1) {
.sound-progress span:nth-child(1){
top: calc(50% + 20px);
}
.sound-progress span:nth-child(2) {
.sound-progress span:nth-child(2){
top: calc(50% + 10px);
}
.sound-progress span:nth-child(3) {
.sound-progress span:nth-child(3){
top: calc(50% - 0px);
}
.sound-progress span:nth-child(4) {
.sound-progress span:nth-child(4){
top: calc(50% - 10px);
}
.sound-progress span:nth-child(5) {
.sound-progress span:nth-child(5){
top: calc(50% - 20px);
}
@@ -232,39 +220,32 @@ video.myCamVideo{
transition-timing-function: ease-in-out;
margin: 0 4%;
}
.btn-cam-action div.disabled {
background: #d75555;
}
.btn-cam-action div.enabled {
background: #73c973;
}
.btn-cam-action:hover div {
.btn-cam-action:hover div{
transform: translateY(0);
}
.btn-cam-action div:hover {
.btn-cam-action div:hover{
background: #407cf7;
box-shadow: 4px 4px 48px #666;
transition: 120ms;
}
.btn-micro {
pointer-events: none;
.btn-micro{
pointer-events: auto;
transition: all .3s;
/*right: 44px;*/
}
.btn-video {
pointer-events: none;
.btn-video{
pointer-events: auto;
transition: all .25s;
/*right: 134px;*/
}
.btn-monitor {
pointer-events: none;
.btn-monitor{
pointer-events: auto;
transition: all .2s;
/*right: 224px;*/
}
@@ -290,26 +271,24 @@ video.myCamVideo{
right: 44px;
opacity: 1;
}
.btn-cam-action div img {
.btn-cam-action div img{
height: 22px;
width: 30px;
position: relative;
pointer-events: all;
}
/* Spinner */
.connecting-spinner {
/*display: inline-block;*/
position: absolute;
left: calc(50% - 62px);
top: calc(50% - 62px);
width: 130px;
height: 130px;
}
/*display: inline-block;*/
position: absolute;
left: calc(50% - 62px);
top: calc(50% - 62px);
width: 130px;
height: 130px;
}
.connecting-spinner:after {
content: " ";
display: block;
@@ -321,7 +300,6 @@ video.myCamVideo{
border-color: #fff transparent #fff transparent;
animation: connecting-spinner 1.2s linear infinite;
}
@keyframes connecting-spinner {
0% {
transform: rotate(0deg);
@@ -331,14 +309,16 @@ video.myCamVideo{
}
}
.rtc-error {
position: absolute;
left: calc(50% - 68px);
top: calc(50% - 68px);
width: 130px;
height: 130px;
}
.rtc-error:after {
content: " ";
display: block;
@@ -357,13 +337,11 @@ video.myCamVideo{
}
/* New layout */
body {
margin: 0;
height: 100%;
width: 100%;
}
.main-container {
height: 100%;
width: 100%;
@@ -374,16 +352,20 @@ body {
.game-overlay {
flex-direction: row;
}
.sidebar {
flex-direction: column;
}
.sidebar>div {
.sidebar > div {
max-height: 21%;
height: 21%;
}
.sidebar>div:hover {
.sidebar > div:hover {
max-height: 25%;
}
}
#game {
@@ -398,7 +380,6 @@ body {
* Style Input Range
* https://www.cssportal.com/style-input-range/
*/
input[type=range] {
height: 28px;
-webkit-appearance: none;
@@ -406,11 +387,9 @@ input[type=range] {
width: 100%;
background-color: transparent;
}
input[type=range]:focus {
outline: none;
}
input[type=range]::-webkit-slider-runnable-track {
width: 100%;
height: 5px;
@@ -420,7 +399,6 @@ input[type=range]::-webkit-slider-runnable-track {
border-radius: 5px;
border: 1px solid #000000;
}
input[type=range]::-webkit-slider-thumb {
box-shadow: 1px 1px 1px #000000;
border: 1px solid #000000;
@@ -431,11 +409,9 @@ input[type=range]::-webkit-slider-thumb {
-webkit-appearance: none;
margin-top: -8.5px;
}
input[type=range]:focus::-webkit-slider-runnable-track {
background: #FFFFFF;
}
input[type=range]::-moz-range-track {
width: 100%;
height: 5px;
@@ -445,7 +421,6 @@ input[type=range]::-moz-range-track {
border-radius: 5px;
border: 1px solid #000000;
}
input[type=range]::-moz-range-thumb {
box-shadow: 1px 1px 1px #000000;
border: 1px solid #000000;
@@ -454,7 +429,6 @@ input[type=range]::-moz-range-thumb {
border-radius: 5px;
background: #FFFFFF;
}
input[type=range]::-ms-track {
width: 100%;
height: 5px;
@@ -463,21 +437,18 @@ input[type=range]::-ms-track {
border-color: transparent;
color: transparent;
}
input[type=range]::-ms-fill-lower {
background: #FFFFFF;
border: 1px solid #000000;
border-radius: 10px;
box-shadow: 1px 1px 1px #000000;
}
input[type=range]::-ms-fill-upper {
background: #FFFFFF;
border: 1px solid #000000;
border-radius: 10px;
box-shadow: 1px 1px 1px #000000;
}
input[type=range]::-ms-thumb {
margin-top: 1px;
box-shadow: 1px 1px 1px #000000;
@@ -487,15 +458,14 @@ input[type=range]::-ms-thumb {
border-radius: 5px;
background: #FFFFFF;
}
input[type=range]:focus::-ms-fill-lower {
background: #FFFFFF;
}
input[type=range]:focus::-ms-fill-upper {
background: #FFFFFF;
}
.game-overlay {
display: none;
position: absolute;
@@ -505,11 +475,11 @@ input[type=range]:focus::-ms-fill-upper {
/* TODO: DO WE NEED FLEX HERE???? WE WANT A SIDEBAR OF EXACTLY 25% (note: flex useful for direction!!!) */
}
.game-overlay+div {
.game-overlay + div {
pointer-events: none;
}
.game-overlay+div>div {
.game-overlay + div > div {
pointer-events: auto;
}
@@ -529,7 +499,7 @@ input[type=range]:focus::-ms-fill-upper {
flex-wrap: wrap;
}
.main-section>div {
.main-section > div {
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;
@@ -537,7 +507,7 @@ input[type=range]:focus::-ms-fill-upper {
/*flex-shrink: 2;*/
}
.main-section>div:hover {
.main-section > div:hover {
margin: 0%;
flex-basis: 100%;
}
@@ -547,7 +517,7 @@ input[type=range]:focus::-ms-fill-upper {
display: flex;
}
.sidebar>div {
.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;
pointer-events: auto;
@@ -557,12 +527,12 @@ input[type=range]:focus::-ms-fill-upper {
}
}
.sidebar>div:hover {
.sidebar > div:hover {
margin: 0%;
}
/* Let's make sure videos are vertically centered if they need to be cropped */
/* Let's make sure videos are vertically centered if they need to be cropped */
.media-container {
display: flex;
flex-direction: column;
@@ -572,20 +542,21 @@ input[type=range]:focus::-ms-fill-upper {
.chat-mode {
display: grid;
width: 100%;
align-items: flex-start;
padding: 1%;
}
.chat-mode>div {
.chat-mode > div {
margin: 1%;
max-height: 96%;
transition: margin-left 0.2s, margin-right 0.2s, margin-bottom 0.2s, margin-top 0.2s;
}
.chat-mode>div:hover {
.chat-mode > div:hover {
margin: 0%;
}
.chat-mode.one-col {
grid-template-columns: repeat(1, 1fr);
}
@@ -618,14 +589,14 @@ input[type=range]:focus::-ms-fill-upper {
border-radius: 0 0 15px 15px;
}
.message-container {
.message-container{
height: auto;
border-radius: 0 0 10px 10px;
color: white;
top: 0;
}
.message-container .content-message {
.message-container .content-message{
position: relative;
padding: 20px;
margin: 20px;
@@ -682,12 +653,10 @@ input[type=range]:focus::-ms-fill-upper {
/* VIDEO QUALITY */
.main-console div.setting h1 {
.main-console div.setting h1{
color: white;
}
.main-console div.setting select {
.main-console div.setting select{
background: black;
color: white;
min-width: 280px;
@@ -696,20 +665,17 @@ input[type=range]:focus::-ms-fill-upper {
padding: 10px;
border-radius: 15px;
}
.main-console div.setting select:focus {
.main-console div.setting select:focus{
border: solid 1px white;
outline: none;
}
.main-console div.setting.active section {
.main-console div.setting.active section{
display: block;
}
/*REPORT input*/
div.modal-report-user {
div.modal-report-user{
position: absolute;
width: 800px;
height: 600px;
@@ -719,7 +685,7 @@ div.modal-report-user {
border-radius: 15px;
}
.modal-report-user textarea {
.modal-report-user textarea{
position: absolute;
height: 200px;
z-index: 999;
@@ -731,7 +697,7 @@ div.modal-report-user {
border-radius: 15px;
}
.modal-report-user img {
.modal-report-user img{
position: absolute;
height: 24px;
width: 24px;
@@ -740,7 +706,7 @@ div.modal-report-user {
top: 10px;
}
.modal-report-user img#cancel-report-user {
.modal-report-user img#cancel-report-user{
position: absolute;
z-index: 999;
right: 0;
@@ -751,7 +717,7 @@ div.modal-report-user {
margin: 10px;
}
.modal-report-user button {
.modal-report-user button{
position: absolute;
top: 450px;
left: calc(50% - 50px);
@@ -770,7 +736,7 @@ div.modal-report-user {
transform: scale(1.1);
}
.modal-report-user p#title-report-user {
.modal-report-user p#title-report-user{
font-size: 30px;
color: white;
position: absolute;
@@ -779,7 +745,7 @@ div.modal-report-user {
text-align: center;
}
.modal-report-user p#body-report-user {
.modal-report-user p#body-report-user{
font-size: 24px;
color: white;
position: absolute;
@@ -787,29 +753,24 @@ div.modal-report-user {
width: 100%;
text-align: left;
padding: 30px;
max-width: calc(800px - 60px);
/* size of modal - padding*/
max-width: calc(800px - 60px); /* size of modal - padding*/
}
/*MESSAGE*/
.discussion {
.discussion{
position: fixed;
left: -300px;
top: 0px;
width: 280px;
width: 220px;
height: 100%;
background-color: #333333;
padding: 20px;
transition: all 0.5s ease;
}
.discussion.active {
.discussion.active{
left: 0;
}
.discussion .active-btn {
.discussion .active-btn{
display: none;
height: 50px;
width: 50px;
@@ -821,47 +782,43 @@ div.modal-report-user {
border: none;
transition: all 0.5s ease;
}
.discussion .active-btn.active {
.discussion .active-btn.active{
display: block;
}
.discussion .active-btn:hover {
transform: scale(1.1) rotateY(3.142rad);
}
.discussion .active-btn img {
.discussion .active-btn img{
width: 26px;
height: 26px;
margin: 13px 5px;
}
.discussion .close-btn {
.discussion .close-btn{
position: absolute;
top: 0;
right: 10px;
background: none;
border: none;
}
.discussion .close-btn img {
.discussion .close-btn img{
height: 15px;
right: 15px;
}
.discussion p {
.discussion p{
color: white;
font-size: 12px;
padding-left: 10px;
margin: 0;
}
.discussion .participants {
.discussion .participants{
height: 200px;
margin: 10px 0;
}
.discussion .participants .participant {
.discussion .participants .participant{
display: flex;
margin: 5px 10px;
background-color: #ffffff69;
@@ -869,11 +826,10 @@ div.modal-report-user {
border-radius: 15px;
}
.discussion .participants .participant:hover {
.discussion .participants .participant:hover{
background-color: #ffffff;
}
.discussion .participants .participant:hover p {
.discussion .participants .participant:hover p{
color: black;
}
@@ -888,12 +844,12 @@ div.modal-report-user {
margin-top: 18px;
}
.discussion .participants .participant img {
.discussion .participants .participant img{
width: 26px;
height: 26px;
}
.discussion .participants .participant p {
.discussion .participants .participant p{
font-size: 16px;
margin-left: 10px;
margin-top: 2px;
@@ -913,11 +869,11 @@ div.modal-report-user {
transition: all .5s ease;
}
.discussion .participants .participant:hover button.report-btn {
.discussion .participants .participant:hover button.report-btn{
width: 70px;
}
.discussion .messages {
.discussion .messages{
position: absolute;
height: calc(100% - 390px);
overflow-x: hidden;
@@ -926,28 +882,28 @@ div.modal-report-user {
width: calc(100% - 40px);
}
.discussion .messages h2 {
.discussion .messages h2{
color: white;
font-size: 12px;
}
.discussion .messages .message {
.discussion .messages .message{
margin: 5px 0px;
float: right;
text-align: right;
width: 100%;
}
.discussion .messages .message.me {
.discussion .messages .message.me{
float: left;
text-align: left;
}
.discussion .messages .message p {
.discussion .messages .message p{
font-size: 10px;
}
.discussion .messages .message p.body {
.discussion .messages .message p.body{
color: black;
font-size: 12px;
white-space: pre-wrap;
@@ -957,8 +913,7 @@ div.modal-report-user {
margin-top: 5px;
margin-bottom: 12px;
}
.discussion .messages .message p a {
.discussion .messages .message p a{
color: white;
}
@@ -974,7 +929,7 @@ div.modal-report-user {
margin-bottom: 10px;
}
.discussion .send-message input {
.discussion .send-message input{
position: absolute;
width: calc(100% - 20px);
height: 30px;
@@ -985,22 +940,20 @@ div.modal-report-user {
padding: 6px;
}
.discussion .send-message img {
.discussion .send-message img{
position: absolute;
margin-right: 10px;
width: 20px;
height: 20px;
background-color: #ffffff69;
}
.discussion .send-message img:hover {
.discussion .send-message img:hover{
background-color: #ffffff;
}
/** Action button **/
div.action {
div.action{
position: absolute;
height: auto;
text-align: center;
@@ -1011,10 +964,9 @@ div.action {
animation-iteration-count: infinite;
animation-timing-function: ease-in-out;
}
div.action.info,
div.action.warning,
div.action.danger {
div.action.danger{
transition: all 1s ease;
animation: mymove 1s;
animation-iteration-count: infinite;
@@ -1028,18 +980,15 @@ div.action p.action-body{
width: 350px;
max-width: 350px;
}
div.action.warning p.action-body {
div.action.warning p.action-body{
background-color: #ff9800eb;
color: #000;
}
div.action.danger p.action-body {
div.action.danger p.action-body{
background-color: #da0000e3;
color: #000;
}
.popUpElement {
.popUpElement{
font-family: 'Press Start 2P';
text-align: left;
color: white;
@@ -1064,8 +1013,10 @@ div.action.danger p.action-body {
.popUpElement .buttonContainer {
float: right;
background-color: inherit;
}
@keyframes mymove {
0% {bottom: 40px;}
50% {bottom: 30px;}
@@ -1115,9 +1066,6 @@ div.is-silent.hide {
right: 15px;
}
.emote-menu .emoji-picker .emoji-picker__emoji {
font-family: "Twemoji Mozilla" !important;
}
.popUpElement.overlay-text {