From 11bd9d3b52b467ad649bfec6b334e809b4560f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Mon, 18 Jun 2018 15:05:40 +0200 Subject: [PATCH 1/2] Fixed some CSS. --- app/stylus/components/Me.styl | 25 ++++++++----------------- app/stylus/components/Peer.styl | 3 ++- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/stylus/components/Me.styl b/app/stylus/components/Me.styl index 18f95d3..aefbd0d 100644 --- a/app/stylus/components/Me.styl +++ b/app/stylus/components/Me.styl @@ -13,11 +13,11 @@ flex-direction:; row; justify-content: flex-end; align-items: center; + padding: 0.4vmin; > .button { flex: 0 0 auto; - margin: 4px; - margin-left: 0; + margin: 0.2vmin; border-radius: 2px; background-position: center; background-size: 75%; @@ -28,8 +28,8 @@ transition-duration: 0.15s; +desktop() { - width: 28px; - height: 28px; + width: 24px; + height: 24px; opacity: 0.85; &:hover { @@ -38,8 +38,8 @@ } +mobile() { - width: 26px; - height: 26px; + width: 22px; + height: 22px; } &.unsupported { @@ -76,23 +76,14 @@ } &.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 { 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'); - } - } } } } diff --git a/app/stylus/components/Peer.styl b/app/stylus/components/Peer.styl index 6b443d3..4dc3036 100644 --- a/app/stylus/components/Peer.styl +++ b/app/stylus/components/Peer.styl @@ -13,10 +13,11 @@ flex-direction:; row; justify-content: flex-start; align-items: center; + padding: 0.4vmin; > .button { flex: 0 0 auto; - margin: 4px; + margin: 0.2vmin; border-radius: 2px; background-position: center; background-size: 75%; From d2496eefe59b4aeff337a61f4b6f47b40ad83f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Mon, 18 Jun 2018 15:11:02 +0200 Subject: [PATCH 2/2] Fixed icons. --- app/resources/images/icon_mic_white_off.svg | 2 +- app/resources/images/icon_remote_mic_white_off.svg | 2 +- app/resources/images/icon_remote_webcam_white_off.svg | 2 +- app/resources/images/icon_webcam_white_on.svg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/resources/images/icon_mic_white_off.svg b/app/resources/images/icon_mic_white_off.svg index 47cc5da..e5dc60c 100644 --- a/app/resources/images/icon_mic_white_off.svg +++ b/app/resources/images/icon_mic_white_off.svg @@ -1,4 +1,4 @@ - + diff --git a/app/resources/images/icon_remote_mic_white_off.svg b/app/resources/images/icon_remote_mic_white_off.svg index 2a4cbc0..e5dc60c 100644 --- a/app/resources/images/icon_remote_mic_white_off.svg +++ b/app/resources/images/icon_remote_mic_white_off.svg @@ -1,4 +1,4 @@ - + diff --git a/app/resources/images/icon_remote_webcam_white_off.svg b/app/resources/images/icon_remote_webcam_white_off.svg index a2379b3..1b7935e 100644 --- a/app/resources/images/icon_remote_webcam_white_off.svg +++ b/app/resources/images/icon_remote_webcam_white_off.svg @@ -1,4 +1,4 @@ - + diff --git a/app/resources/images/icon_webcam_white_on.svg b/app/resources/images/icon_webcam_white_on.svg index beec50b..ec150fe 100644 --- a/app/resources/images/icon_webcam_white_on.svg +++ b/app/resources/images/icon_webcam_white_on.svg @@ -1,4 +1,4 @@ - +