diff --git a/bigbluebutton-html5/client/stylesheets/bbb-icons.css b/bigbluebutton-html5/client/stylesheets/bbb-icons.css index 2b17878aa403824d99d51cdc721ec868f25d5ea8..f2f41e682055e10d5770508ef4b41169945efaa1 100755 --- a/bigbluebutton-html5/client/stylesheets/bbb-icons.css +++ b/bigbluebutton-html5/client/stylesheets/bbb-icons.css @@ -282,3 +282,6 @@ .icon-bbb-popout_window:before { content: "\e956"; } +.icon-bbb-closed_caption:before { + content: "\e957"; +} diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx index 5bd30c713efa8d6233e8c0c547e4cb38c4e974b7..9bc0eaacc81e9fc0dd1be984406529c74bc81efc 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx @@ -166,7 +166,7 @@ class ActionsDropdown extends Component { (CaptionsService.isCaptionsEnabled() ? ( <DropdownListItem - icon="polling" + icon="closed_caption" label={formatMessage(captionsLabel)} description={formatMessage(captionsDesc)} key={this.captionsId} diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/captions/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/captions/component.jsx index e081757497d81996f170d6e8c9cfe6726d3ac94d..3a09d38749f79035b474548fb3d046ca0b6d813d 100644 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/captions/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/captions/component.jsx @@ -25,7 +25,7 @@ const intlMessages = defineMessages({ const CaptionsButton = ({ intl, isActive, handleOnClick }) => ( <Button className={cx(styles.button, isActive || styles.btn)} - icon="polling" + icon="closed_caption" label={intl.formatMessage(isActive ? intlMessages.stop : intlMessages.start)} color={isActive ? 'primary' : 'default'} ghost={!isActive} diff --git a/bigbluebutton-html5/imports/ui/components/user-list/captions-list-item/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/captions-list-item/component.jsx index 6e8bd9d5c2f450c12735198c3a55c77ca2ced1c2..eab8c234128d3e386906c4f61d3be7f1e52aabc5 100644 --- a/bigbluebutton-html5/imports/ui/components/user-list/captions-list-item/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/user-list/captions-list-item/component.jsx @@ -53,7 +53,7 @@ const CaptionsListItem = (props) => { onClick={() => handleClickToggleCaptions(locale.locale)} aria-label={`${locale.name} ${intl.formatMessage(intlMessages.captionLabel)}`} > - <Icon iconName="polling" /> + <Icon iconName="closed_caption" /> <span aria-hidden>{locale.name}</span> </div> ); diff --git a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss index 7b2e230fdcc81af574019c1a4df953d26a5e53f7..63eb42ba3a74554b5428397e37a95fdb67733fac 100644 --- a/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-notes/styles.scss @@ -7,7 +7,6 @@ font-weight: 600; text-transform: uppercase; padding: 0 var(--sm-padding-x); - color: var(--color-gray-light); margin-bottom: var(--lg-padding-y); margin-top: var(--sm-padding-x); } diff --git a/bigbluebutton-html5/private/locales/en.json b/bigbluebutton-html5/private/locales/en.json index 1f500b4f631b606794811f465e23d5a3ea60a3af..70585f85b508a847235dd6b655b8f365a5465b6b 100755 --- a/bigbluebutton-html5/private/locales/en.json +++ b/bigbluebutton-html5/private/locales/en.json @@ -26,7 +26,7 @@ "app.captions.menu.ariaStartDesc": "Opens captions editor and closes the modal", "app.captions.menu.select": "Select available language", "app.captions.menu.ariaSelect": "Captions language", - "app.captions.menu.title": "Closed captions menu", + "app.captions.menu.title": "Closed captions", "app.captions.menu.fontSize": "Size", "app.captions.menu.fontColor": "Text color", "app.captions.menu.fontFamily": "Font", diff --git a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff index 2c8d5af4eccb12b31972f526c43a65bafddd18b9..94fd582f1300009a0c886423b51879118f59beda 100644 Binary files a/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff and b/bigbluebutton-html5/public/fonts/BbbIcons/bbb-icons.woff differ