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

Merge branch 'feature-settings' into develop

master
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/stylus/components/Peer.styl
View File

@ -60,7 +60,7 @@
} }
&.off { &.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); background-color: rgba(#d42241, 0.7);
} }
@ -75,7 +75,8 @@
} }
&.off { &.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 { &.unsupported {

10
app/stylus/components/PeerView.styl
View File

@ -74,12 +74,12 @@
+mobile() { +mobile() {
&.is-me { &.is-me {
padding: 10px; padding: 1vmin;
align-items: flex-start; align-items: flex-start;
} }
&:not(.is-me) { &:not(.is-me) {
padding: 10px; padding: 1vmin;
align-items: flex-end; align-items: flex-end;
} }
} }
@ -118,15 +118,15 @@
} }
> .row { > .row {
margin-top: 4px; margin-top: 0.4vmin;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: flex-start; justify-content: flex-start;
align-items: flex-end; align-items: flex-end;
> .device-icon { > .device-icon {
height: 18px; height: 12px;
width: 18px; width: 12px;
margin-right: 3px; margin-right: 3px;
user-select: none; user-select: none;
pointer-events: none; pointer-events: none;