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.

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

creat pull request #79

Merged
merged 5 commits into from
Jun 11, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
10 changes: 5 additions & 5 deletions chat-client/.firebase/hosting.ZGlzdA.cache
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ assets/images/video-off.png,1591039185876,2c2181a809d88330d0fbcd92c50f1a8239a741
assets/images/video.png,1591039185876,bbb674752a337e00ada8e91df3473895c07f36ed41603d03aab16637974e1fa5
assets/images/wfh_9.svg,1591039185876,a573c47f40be1ceb7ef984f3a88d613fa8633d4448fc5e3f9b31f1f022e0bdbe
assets/images/whitesilogo.png,1591039185880,6038d1b0b17297494d7514156f344909aacb645d0dc4318038adde39f7454b29
index.html,1591776539333,dd2fb4411e602fc5fbc6482a47f4f395d5b9d4a323cd13f4e20e924884ddc435
styles.3a946b3bdfde9236886d.css,1591776523952,634e3f22c9bd603f775b75bff756796d15ffd4860b2c2e823159c47f7d912c2d
3rdpartylicenses.txt,1591776523950,0694dce82e2bc3026d2a194a72a896b3d1faaae09afcffdc0508f80c7a7fbde6
main-es2015.b595a5276af5daf404a2.js,1591776537354,d2b5f90e7c4510bd461cb85bbd6225cbce171c784c1477e9a0f5e57582e7e53d
main-es5.b595a5276af5daf404a2.js,1591776535528,1e71b1a1df31667cfd95f659f1c2da6032fdb9a3a8ede59aae2438c98c4da907
index.html,1591792827536,b4c09e550c9b5b862af28e599b6e3fe41e825572f8b960446fc917e7067a3ed3
styles.3a946b3bdfde9236886d.css,1591792812011,634e3f22c9bd603f775b75bff756796d15ffd4860b2c2e823159c47f7d912c2d
3rdpartylicenses.txt,1591792812010,0694dce82e2bc3026d2a194a72a896b3d1faaae09afcffdc0508f80c7a7fbde6
main-es2015.db3e200640b811d4d260.js,1591792825529,784c7d1bb11c0466a5f617fb8951b0d1cbb0a7f08082acb2e35515a948d0f34f
main-es5.db3e200640b811d4d260.js,1591792823627,b353b822c597dbdff03e1fff36a240002963eb5f1405ec22e7ea39df4bddae7f
2 changes: 1 addition & 1 deletion chat-client/src/app/navbar/navbar.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ nav i.fa:hover {
background-color: #fff;
position:fixed;
top:150px;
left:26.4vw;
left:22.8vw;
width:80rem;
height:auto;
overflow-x:none;
Expand Down
15 changes: 13 additions & 2 deletions chat-client/src/app/room/room.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,16 @@ input.ng-invalid.ng-touched {

}


.curr-session {
position:fixed;
top:5rem;
left:0;
background-color: rgba(0, 0, 0, 0.5);
color:#5BC0BE;
padding:.5rem .8rem;
font-size:1.6rem;
z-index:5;
}

.container-videos {

Expand Down Expand Up @@ -534,7 +543,9 @@ button:focus {
widows: 1px !important;;
}


.curr-session {
font-size:1.2rem;
}

.join-button {
margin-bottom: 50px;
Expand Down
1 change: 1 addition & 0 deletions chat-client/src/app/room/room.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
<div class="row video-margin">
<div *ngIf="mainStreamManager" style="padding:0px 0px;" id="main-video"
class="col-md-9 col-sm-12 col-xs-12">
<div class="curr-session">{{ mySessionId }}</div>
<div (click)="chatClose()">
<Main-video [streamManager]="mainStreamManager"></Main-video>
</div>
Expand Down