merge into develop

This commit is contained in:
_Bastler
2021-05-08 20:05:08 +02:00
85 changed files with 2648 additions and 1337 deletions
+1 -1
View File
@@ -45,7 +45,7 @@
text-align: center;
margin: 0;
position: absolute;
top: 44vh;
top: 40vh;
width: 100%;
}
#enableCameraScene button#enableCameraSceneFormCancel {
+7
View File
@@ -45,6 +45,9 @@
font-size: 7px;
margin: 0px 20px;
}
#helpCameraSettings section p a{
font-size: 8px;
}
#helpCameraSettings section p.err{
color: #ff0000;
}
@@ -80,6 +83,10 @@
<p>If you prefer to continue without allowing camera and microphone access, click on Continue</p>
<p id='browserHelpSetting'></p>
</section>
<!--<section class="text-center">
<p>If your problem persist, please contact us: <a id="mailto" href="mailto:workadventure@thecodingmachine.com?subject=Support camera and microphone settings" target="_blank"> workadventure@thecodingmachine.com</a>.</p>
</section>-->
</section>
<section class="action">
<a href="#" class="nes-btn" id="helpCameraSettingsFormRefresh">Refresh</a>
<button type="submit" class="nes-btn is-warning" id="helpCameraSettingsFormContinue">Continue</button>
+4 -14
View File
@@ -23,27 +23,17 @@
}
.btn-cam-action {
min-width: 150px;
&:hover{
transform: translateY(20px);
}
div {
margin: 0 1%;
&:hover {
background-color: #666;
}
bottom: 30px;
&.btn-micro {
right: 0;
}
&.btn-monitor {
right: 130px;
}
&.btn-video {
right: 65px;
}
margin-bottom: 30px;
}
}
+328 -155
View File
File diff suppressed because it is too large Load Diff