From aaf2f428e6d7a3b21e4fae7f6fec158cf53d3a2e Mon Sep 17 00:00:00 2001 From: virtuacoplenny Date: Sun, 29 Apr 2018 21:30:07 -0700 Subject: [PATCH] feat(recording): new label for live streaming (#2890) --- css/_font.scss | 3 + css/modals/video-quality/_video-quality.scss | 14 +- fonts/jitsi.eot | Bin 11156 -> 11332 bytes fonts/jitsi.svg | 1 + fonts/jitsi.ttf | Bin 11000 -> 11176 bytes fonts/jitsi.woff | Bin 11076 -> 11252 bytes fonts/selection.json | 401 ++++++++++-------- react/features/base/font-icons/jitsi.json | 401 ++++++++++-------- .../components/RecordingLabel.web.js | 29 +- 9 files changed, 469 insertions(+), 380 deletions(-) diff --git a/css/_font.scss b/css/_font.scss index aea088b4f9..0339740cf5 100644 --- a/css/_font.scss +++ b/css/_font.scss @@ -201,3 +201,6 @@ .icon-rec:before { content: "\e92b"; } +.icon-live:before { + content: "\e92c"; +} diff --git a/css/modals/video-quality/_video-quality.scss b/css/modals/video-quality/_video-quality.scss index b4f7c83acd..0b84a1d373 100644 --- a/css/modals/video-quality/_video-quality.scss +++ b/css/modals/video-quality/_video-quality.scss @@ -174,22 +174,30 @@ .recording-icon, .recording-icon i { - color: rgb(255, 86, 48); line-height: $videoStateIndicatorSize; font-size: $videoStateIndicatorSize; opacity: 0.9; position: relative; } + .icon-rec { + color: #FF5630; + } + + .icon-live { + color: #0065FF; + } + .recording-icon-background { background: white; - height: 25%; + border-radius: 50%; + height: calc(#{$videoStateIndicatorSize} - 1px); left: 50%; opacity: 0.9; position: absolute; top: 50%; transform: translate(-50%, -50%); - width: 80%; + width: calc(#{$videoStateIndicatorSize} - 1px); } #recordingLabelText { diff --git a/fonts/jitsi.eot b/fonts/jitsi.eot index cf4424f189bd3e93bdf3b42c450ee27520bbfeac..69b78c82b981a8a92ce37b1232143df7146f14da 100755 GIT binary patch delta 380 zcmbOdek6j;MTdc5h4w@?GnUTlC!;1hq9jb!Hhr0ge=wT|mAAkgt-FTT;QQC4B|RPXX%T$;nSn zR4UhQU|`TJ0LpjdCRP+M_%R#?@`2_tDC8yPrrw=UyPSbRO9H4quOPp;gn=0-!=T*( zl4oFMnH&Snm#kE+6~AbA!bWRPZ1WKd<$Ww4qope`rRsBEe%YHSQ5 z%$3=d)s@9nl}&+M5EeByot&pGnfC8Mf$7pz({CY`mdutmVT@@-IXOkkmosQ+bjQVJ zWyQvIYXAX)&A9ITUm!Sm@UO0&rnTN*U7#z0wgYk0$?Ki*{5D@1xPcASF(sUBiZ%no53Px8W-NEpnuRAiY- z1LF?{2Gx{|)Wj6Qi3cV!FsR1>)tO}g1vpYzb^`fRfP9sV+>#1LE$J&j{tloXj-34D zM5S_x3I+y^13>w<+{B6k249B53=EncK)ym=Vs7f)3AM|C{0yM_yn_7V5(Z|V41?AU zkURr3%j9TA2S)A5a~QK3wKsDxeN+B{2Z6(ayz972x( diff --git a/fonts/jitsi.svg b/fonts/jitsi.svg index 318f1d0733..819949dcaa 100755 --- a/fonts/jitsi.svg +++ b/fonts/jitsi.svg @@ -69,4 +69,5 @@ + \ No newline at end of file diff --git a/fonts/jitsi.ttf b/fonts/jitsi.ttf index 739cd85b126c5a52a8b1f22a06322236dee55ec5..fd52ede752641f877d80dd5a8c82283bbfd8de07 100755 GIT binary patch delta 374 zcmewnx+1)ufsuiMft#U$ftkU;KUm+0?;_i6pvWE|PDsv8EN~D1md?PyC; z0MY_L{s$n76%cyjWSEfbZ>wHp{1G(iS;AkglZxWk=MXA)yJqt50W#*eCktRP_)AY_ncP-IYL(4DNKtRT;* zY^p43Yz!jImD!cmmBm$+O@Ukx7Bx1VET|$W{_jA6>C#lwZy}bJ%$7D`jA=zVIYrBt zPqtE#GF^B6FAy9&_*d6X(^~JZF3=S~Yk)ZFVgvx#DqocV delta 270 zcmZ1x{v))WfsuiMft#U$ftkU;KUm+0?;_hRpvWE|PDsv8EN~D1md3!qC; z0MY_L{s$nvmYqQU6d+$E zBe$f2QA_#?kiP?{ha)FH*)mb7T%v-3LE`{WL0fKOMFE2^!(j#nO%EVnAulmE_3nh) zS_9a}T+~3WOfsp|Sw7)QLgXtBM1(+lz>Im20PR>m%U|?X(0196LVfXNF>FJ5Z zKrtp8AfE$@1=4dW(|}?w3=C=lAY3DG+ax13F@=FaBLt|%41@)zJb9V{6akY-S1 zP-W0%u$p{8O-`Os*;HB7*ce2ZE3+%BD~qctn*zBYENW~zSx#Lt?cad{)1|4V-$E=c znJsO?7}JV!a*CEOXVB2-j*HF8ijC{m00IP?aozd9KydKjUtK#*YrVg^K-U3n2jZxc x*E{3+ZN4&a104bc*E#*a!sy9o)Xf>4H?wGPFiz&s?BWpS0PAwzJWF#GBLHk@YjFSo delta 304 zcmewoek4q!+~3WOfsp|Sv|SjuLA2J7$pTCg6Lo~^Zzbm@7BDa{W&lO6fUtY`x3u)c zVxSn44Uo?P#RBO$m1#gR7X}8^6cAp#!*@wWY9f%Wz5=Mm41@(I9+;Q`6a@<0RirPR}sa&EWH?aa}vE~#YUjdAL z84l+q=B5J0wg5Hef$-f4waW|gi%WpMQJMJ1pHX|V4`Vi?_U0XoA61nZfx3WLxH;`^ uJipCX25z98KyaOX?`ar4xkAI7(P{Gr4GzZ1do
- +
:
{ this.props.t(key) } @@ -139,20 +155,23 @@ class RecordingLabel extends Component { * @returns {{ * _filmstripVisible: boolean, * _isRecording: boolean, - * _labelDisplayConfiguration: Object + * _labelDisplayConfiguration: Object, + * _recordingType: string * }} */ function _mapStateToProps(state) { const { visible } = state['features/filmstrip']; const { labelDisplayConfiguration, - recordingState + recordingState, + recordingType } = state['features/recording']; return { _filmstripVisible: visible, _isRecording: recordingState === JitsiRecordingStatus.ON, - _labelDisplayConfiguration: labelDisplayConfiguration + _labelDisplayConfiguration: labelDisplayConfiguration, + _recordingType: recordingType }; }