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 15:06:10 +02:00
parent 5c1de30468 11bd9d3b52
commit 1513042146
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/stylus/components/Me.styl
View File

@ -13,11 +13,11 @@
flex-direction:; row; flex-direction:; row;
justify-content: flex-end; justify-content: flex-end;
align-items: center; align-items: center;
padding: 0.4vmin;
> .button { > .button {
flex: 0 0 auto; flex: 0 0 auto;
margin: 4px; margin: 0.2vmin;
margin-left: 0;
border-radius: 2px; border-radius: 2px;
background-position: center; background-position: center;
background-size: 75%; background-size: 75%;
@ -28,8 +28,8 @@
transition-duration: 0.15s; transition-duration: 0.15s;
+desktop() { +desktop() {
width: 28px; width: 24px;
height: 28px; height: 24px;
opacity: 0.85; opacity: 0.85;
&:hover { &:hover {
@ -38,8 +38,8 @@
} }
+mobile() { +mobile() {
width: 26px; width: 22px;
height: 26px; height: 22px;
} }
&.unsupported { &.unsupported {
@ -76,23 +76,14 @@
} }
&.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 {
background-image: url('/resources/images/icon_webcam_white_unsupported.svg'); background-image: url('/resources/images/icon_webcam_white_unsupported.svg');
} }
} }
&.change-webcam {
&.on {
background-image: url('/resources/images/icon_change_webcam_black.svg');
}
&.unsupported {
background-image: url('/resources/images/icon_change_webcam_white_unsupported.svg');
}
}
} }
} }
} }

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

@ -13,10 +13,11 @@
flex-direction:; row; flex-direction:; row;
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
padding: 0.4vmin;
> .button { > .button {
flex: 0 0 auto; flex: 0 0 auto;
margin: 4px; margin: 0.2vmin;
border-radius: 2px; border-radius: 2px;
background-position: center; background-position: center;
background-size: 75%; background-size: 75%;