Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix canvas UI #390

Merged
merged 4 commits into from
Nov 23, 2023
Merged

Fix canvas UI #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1d8b9f3
fix publish page
USAMAWIZARD Jul 9, 2023
057d041
fix play UI
USAMAWIZARD Jul 9, 2023
67d65e1
Merge branch 'master' into fix_canvas_ui
Jul 11, 2023
29c8858
Merge branch 'master' into fix_canvas_ui
USAMAWIZARD Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/main/webapp/canvas-player.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
position: absolute;
*/
top: 0;
margin-left: -40px;
}

/* Everything but the jumbotron gets side spacing for mobile first views */
Expand Down Expand Up @@ -116,7 +117,7 @@ <h3 class="col text-muted">WebRTC Play</h3>
<div class="row">
<div class="col-md-12">

<div class="jumbotron">
<div class="jumbotron" style="height: 900px;">

<video id="remoteVideo" autoplay muted controls playsinline></video>
<div id="canvas-designer"></div>
Expand Down Expand Up @@ -146,7 +147,9 @@ <h3 class="col text-muted">WebRTC Play</h3>
</div>

<div class="dropdown-divider"></div>

<span class="badge badge-info" style="font-size:14px; margin:15px; display: block; text-align: center;">
Make sure Data channel is enabled on App Settings.<br>Otherwise, it does not work.
</span>
<div class="form-group">
<button class="btn btn-primary"
id="start_play_button">Start Playing</button>
Expand Down Expand Up @@ -627,5 +630,3 @@ <h3 class="col text-muted">WebRTC Play</h3>

</script>
</html>


15 changes: 9 additions & 6 deletions src/main/webapp/canvas-publish.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<style>
video {
position: relative;
left: 0;
left: 40px;
right: 0;
top: 0;
/* If you want to fit canvas-designer and video to fit perfectly
Expand All @@ -43,7 +43,8 @@
*/
border-color: black !important;
border: 0 solid black !important;
top: 0;
top:0;
left: -25px;
clear: both;
}

Expand Down Expand Up @@ -128,7 +129,7 @@ <h3 class="col text-muted">WebRTC Publish</h3>
<div class="row">
<div class="col-md-12">

<div class="jumbotron">
<div class="jumbotron" style="height: 900px;">


<video id="localVideo" autoplay muted controls playsinline></video>
Expand Down Expand Up @@ -167,9 +168,11 @@ <h3 class="col text-muted">WebRTC Publish</h3>
</div>

<div class="dropdown-divider"></div>

<span class="badge badge-warning" style="font-size:14px; margin:15px;">Make sure Data channel is enabled on App Settings. Otherwise it does not work.</span>

<div>
<span class="badge badge-info" style="font-size:14px; margin:15px; display: block; text-align: center;">
Make sure Data channel is enabled on App Settings.<br>Otherwise, it does not work.
</span>
</div>
<div class="form-group">
<button class="btn btn-primary" disabled id="start_publish_button">Start Publishing</button>
<button class="btn btn-primary" disabled id="stop_publish_button">Stop Publishing</button>
Expand Down