diff --git a/bigbluebutton-html5/client/stylesheets/bbb-icons.css b/bigbluebutton-html5/client/stylesheets/bbb-icons.css index 853b0f017599c3c97acdf6c5f6a9289eb6ce87e7..c3765dae5c7ff9128b7a00e4d19cd9afe5ab2746 100755 --- a/bigbluebutton-html5/client/stylesheets/bbb-icons.css +++ b/bigbluebutton-html5/client/stylesheets/bbb-icons.css @@ -89,6 +89,9 @@ .icon-bbb-desktop:before { content: "\e928"; } +.icon-bbb-desktop_off:before { + content: "\e953"; +} .icon-bbb-logout:before { content: "\e900"; } diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx index 29172eee36fb689c50255e639f5abff91092f6c2..e6d2ae31e9dd81fa1a7b8d4765afd243e5f01d03 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/desktop-share/component.jsx @@ -50,7 +50,7 @@ const DesktopShare = ({ (screenSharingCheck && !isMobileBrowser && isUserPresenter ? <Button className={styles.button} - icon={isVideoBroadcasting ? 'desktop' : 'desktop'} + icon={isVideoBroadcasting ? 'desktop_off' : 'desktop'} label={intl.formatMessage(isVideoBroadcasting ? intlMessages.stopDesktopShareLabel : intlMessages.desktopShareLabel)} description={intl.formatMessage(isVideoBroadcasting ? diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot index 002765657c7b16bb5cbb69a1dc02c1236cd98ede..35752e9e8f20fe49a49d45810f179d1df2ecc403 100644 Binary files a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.eot differ diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg index 7ad7ba23d8f2dd5070ed6dd3ea3143246346af26..973ea22ce428517c08c56203555c39088bf4bec8 100644 --- a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg +++ b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.svg @@ -5,7 +5,7 @@ --> <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1"> <metadata> -Created by FontForge 20170731 at Thu Jul 05 16:25:35 2018 +Created by FontForge 20170731 at Sun Aug 05 09:23:33 2018 By BigBlueButton Inc. Copyright (c) 2016-2017, BigBlueButton Inc. </metadata> @@ -170,8 +170,8 @@ d="M870 385c31 0 59 -24 59 -61v-450c0 -34 -28 -59 -62 -59h-713c-31 0 -62 25 -62 d="M251 645h722c22 0 34 -18 34 -36s-12 -36 -34 -36h-722c-22 0 -34 18 -34 36s12 36 34 36zM251 135h231c22 0 34 -18 34 -36s-12 -36 -34 -36h-231c-22 0 -34 18 -34 36s12 36 34 36zM251 385h484c22 0 34 -18 34 -36s-12 -36 -34 -36h-484c-22 0 -34 18 -34 36 s12 36 34 36zM12 609c0 40 30 72 68 72s69 -32 69 -72s-31 -72 -69 -72s-68 32 -68 72zM15 349c0 38 29 69 65 69s65 -31 65 -69s-29 -68 -65 -68s-65 30 -65 68zM12 97c0 40 30 72 68 72s69 -32 69 -72s-31 -72 -69 -72s-68 32 -68 72z" /> <glyph glyph-name="desktop" unicode="" -d="M925 751c48 0 85 -38 85 -82v-598c0 -44 -38 -81 -82 -81h-269v-72h89c14 0 27 -13 27 -27s-10 -28 -27 -28h-468c-17 0 -27 14 -27 28s10 27 27 27h89v72h-270c-44 0 -82 37 -82 81v598c0 44 38 82 82 82h826zM601 -79v72h-177v-72h177zM952 75v594c0 14 -10 24 -24 24 -h-829c-14 0 -24 -10 -24 -24v-594c0 -14 10 -24 24 -24h826c14 0 27 10 27 24z" /> +d="M855 674c36 -1 66 -31 67 -67v-491c0 -37 -30 -67 -67 -68h-223v-62h73c13 0 23 -11 23 -24s-10 -23 -23 -23h-386c-13 0 -23 10 -23 23s10 24 23 24h75v60h-223c-38 0 -69 30 -69 68v493c1 37 32 67 69 67h684zM585 -12v60h-146v-60h146zM876 607c0 11 -9 19 -19 19 +h-686c-11 0 -19 -8 -19 -19v-493c0 -10 8 -19 19 -19h684c11 0 19 9 19 19z" /> <glyph glyph-name="fit_to_screen" unicode="" d="M594 -34c5 5 11 8 18 8s14 -3 19 -8c8 -8 13 -18 13 -27c0 -6 -2 -12 -6 -18l-102 -102c-5 -7 -12 -11 -20 -11s-17 4 -24 11l-106 109c-5 5 -7 12 -7 18c0 10 5 20 14 26c6 4 12 6 18 6c9 0 18 -4 26 -12l48 -48v246c0 17 13 27 30 27s31 -10 31 -27v-246zM631 645 c-5 -5 -12 -7 -19 -7s-13 2 -18 7l-48 48v-246c0 -17 -14 -27 -31 -27s-30 10 -30 27v246l-48 -48c-8 -8 -17 -12 -27 -12c-6 0 -12 1 -17 5c-9 6 -14 17 -14 27c0 6 2 12 7 17l106 110c7 7 15 10 22 10c8 0 16 -4 22 -10l102 -103c4 -6 6 -11 6 -17c0 -9 -5 -19 -13 -27z @@ -332,5 +332,9 @@ c0 -3 0 -7 -1 -10l-46 -269l242 126c8 3 18 5 28 5s20 -2 28 -6z" /> <glyph glyph-name="star_filled" unicode="" d="M243 -167c-33 1 -60 28 -60 61c0 2 1 7 1 10l46 266l-196 192c-10 9 -18 29 -18 42c0 29 24 56 52 60l269 39l121 244c9 19 33 34 54 34s45 -15 54 -34l120 -243l270 -40c28 -4 52 -31 52 -60c0 -13 -8 -33 -18 -42l-196 -192l46 -268c0 -3 1 -7 1 -10 c0 -17 -11 -39 -25 -49c-9 -6 -24 -11 -35 -11c-8 0 -21 3 -28 7l-241 127l-241 -127c-7 -3 -19 -6 -27 -6h-1z" /> + <glyph glyph-name="desktop_off" unicode="" +d="M928 707c4 -4 7 -12 7 -18s-4 -14 -8 -18l-29 -28c13 -12 23 -34 24 -51v-494c-1 -35 -31 -65 -67 -66h-223v-59h76c13 0 24 -11 24 -24s-11 -24 -24 -24h-392c-13 0 -24 11 -24 24s11 24 24 24h78v60h-128l-131 -126c-4 -4 -12 -8 -18 -8s-14 4 -18 8s-8 12 -8 18 +s4 14 8 18l92 89h-20c-37 0 -68 30 -69 66v494c2 36 32 66 69 66h669l52 49c4 4 12 8 18 8s14 -4 18 -8zM171 79h68l552 532h-620c-11 0 -19 -9 -19 -19v-494c0 -10 8 -19 19 -19zM586 -28l-1 60h-146v-60h147zM874 592c0 7 -5 14 -11 17l-551 -530h543c11 0 19 9 19 19v494 +z" /> </font> </defs></svg> diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf index c0827970529f084e58b717cbf26ea05e1b2145ed..772bb083e334f22808a4122426727aa4440bcb58 100644 Binary files a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.ttf differ diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff index 81fc4c7518ff291432a360ac1e99d96206db8c84..3e4ecad3d2bc335717d32f59fb5d2ed7d61770bc 100644 Binary files a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff differ