Briq/multiparty-meeting
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature-settings' into develop

Browse Source
This commit is contained in:
Håvar Aambø Fosstveit
2018-06-18 14:54:24 +02:00
parent 071d50e66c fd0083506c
commit 5c1de30468
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/stylus/components/Peer.styl
+3 -2
View File
@@ -60,7 +60,7 @@
}
&.off {
background-image: url('/resources/images/icon_mic_white_off.svg');
background-image: url('/resources/images/icon_remote_mic_white_off.svg');
background-color: rgba(#d42241, 0.7);
}
@@ -75,7 +75,8 @@
}
&.off {
background-image: url('/resources/images/icon_webcam_white_on.svg');
background-image: url('/resources/images/icon_remote_webcam_white_off.svg');
background-color: rgba(#d42241, 0.7);
}
&.unsupported {
app/stylus/components/PeerView.styl
+5 -5
View File
@@ -74,12 +74,12 @@
+mobile() {
&.is-me {
padding: 10px;
padding: 1vmin;
align-items: flex-start;
}
&:not(.is-me) {
padding: 10px;
padding: 1vmin;
align-items: flex-end;
}
}
@@ -118,15 +118,15 @@
}
> .row {
margin-top: 4px;
margin-top: 0.4vmin;
display: flex;
flex-direction: row;
justify-content: flex-start;
align-items: flex-end;
> .device-icon {
height: 18px;
width: 18px;
height: 12px;
width: 12px;
margin-right: 3px;
user-select: none;
pointer-events: none;