diff --git a/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx b/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx index df6f556725..3df4a31b66 100644 --- a/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/activity-check/component.jsx @@ -7,7 +7,7 @@ import Modal from '/imports/ui/components/modal/simple/component'; import { makeCall } from '/imports/ui/services/api'; import { Meteor } from 'meteor/meteor'; -import { styles } from './styles'; +import Styled from './styles'; const propTypes = { intl: PropTypes.shape({ @@ -98,7 +98,7 @@ class ActivityCheck extends Component { shouldCloseOnOverlayClick={false} shouldShowCloseButton={false} > -
+

{intl.formatMessage(intlMessages.activityCheckTitle)}

{intl.formatMessage(intlMessages.activityCheckLabel, { 0: responseDelay })}

+ ); } diff --git a/bigbluebutton-html5/imports/ui/components/activity-check/styles.js b/bigbluebutton-html5/imports/ui/components/activity-check/styles.js new file mode 100644 index 0000000000..b7eedbb840 --- /dev/null +++ b/bigbluebutton-html5/imports/ui/components/activity-check/styles.js @@ -0,0 +1,23 @@ +import styled from 'styled-components'; +import { fontSizeLarge } from '/imports/ui/stylesheets/styled-components/typography'; + +const ActivityModalContent = styled.div` + flex-direction: column; + flex-grow: 1; + display: flex; + justify-content: center; + padding: 0; + margin-top: auto; + margin-bottom: auto; + padding: 0.5rem; + text-align: center; + + & > p { + font-size: ${fontSizeLarge}; + margin: 0.5em 0; + } +`; + +export default { + ActivityModalContent, +}; diff --git a/bigbluebutton-html5/imports/ui/components/activity-check/styles.scss b/bigbluebutton-html5/imports/ui/components/activity-check/styles.scss deleted file mode 100644 index da80838eca..0000000000 --- a/bigbluebutton-html5/imports/ui/components/activity-check/styles.scss +++ /dev/null @@ -1,16 +0,0 @@ -.activityModalContent { - flex-direction: column; - flex-grow: 1; - display: flex; - justify-content: center; - padding: 0; - margin-top: auto; - margin-bottom: auto; - padding: 0.5rem; - text-align: center; - - p { - font-size: var(--font-size-large); - margin: 0.5em 0; - } -} \ No newline at end of file diff --git a/bigbluebutton-html5/imports/ui/components/banner-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/banner-bar/component.jsx index d38d4ce063..bd3d6e4f1f 100644 --- a/bigbluebutton-html5/imports/ui/components/banner-bar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/banner-bar/component.jsx @@ -1,7 +1,7 @@ import React, { useEffect } from 'react'; import PropTypes from 'prop-types'; import NotificationsBar from '/imports/ui/components/notifications-bar/component'; -import { styles } from './styles'; +import Styled from './styles'; import { ACTIONS } from '../layout/enums'; const BannerBar = ({ @@ -22,9 +22,9 @@ const BannerBar = ({ return ( - + {text} - + ); }; diff --git a/bigbluebutton-html5/imports/ui/components/banner-bar/styles.js b/bigbluebutton-html5/imports/ui/components/banner-bar/styles.js new file mode 100644 index 0000000000..ff7966287d --- /dev/null +++ b/bigbluebutton-html5/imports/ui/components/banner-bar/styles.js @@ -0,0 +1,11 @@ +import styled from 'styled-components'; +import { TextElipsis } from '/imports/ui/stylesheets/styled-components/placeholders'; +import { colorWhite } from '/imports/ui/stylesheets/styled-components/palette'; + +const BannerTextColor = styled(TextElipsis)` + color: ${colorWhite}; +`; + +export default { + BannerTextColor, +}; diff --git a/bigbluebutton-html5/imports/ui/components/banner-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/banner-bar/styles.scss deleted file mode 100644 index b8d073ed64..0000000000 --- a/bigbluebutton-html5/imports/ui/components/banner-bar/styles.scss +++ /dev/null @@ -1,6 +0,0 @@ -@import "/imports/ui/stylesheets/variables/placeholders"; - -.bannerTextColor { - @extend %text-elipsis; - color: var(--color-white); -} \ No newline at end of file diff --git a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx index 6ff927e5ea..6a5ab7cc97 100755 --- a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/component.jsx @@ -8,7 +8,7 @@ import AudioService from '../audio/service'; import VideoService from '../video-provider/service'; import { screenshareHasEnded } from '/imports/ui/components/screenshare/service'; import UserListService from '/imports/ui/components/user-list/service'; -import { styles } from './styles'; +import Styled from './styles'; const intlMessages = defineMessages({ title: { @@ -173,10 +173,9 @@ class BreakoutJoinConfirmation extends Component { const { breakouts, intl } = this.props; const { selectValue, waiting, } = this.state; return ( -
+ {`${intl.formatMessage(intlMessages.freeJoinMessage)}`} - + { waiting ? {intl.formatMessage(intlMessages.generatingURL)} : null} -
+ ); } diff --git a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/styles.js b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/styles.js new file mode 100644 index 0000000000..a30b4665de --- /dev/null +++ b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/styles.js @@ -0,0 +1,20 @@ +import styled from 'styled-components'; +import { colorWhite, colorGrayLighter } from '/imports/ui/stylesheets/styled-components/palette'; + +const SelectParent = styled.div` + display: flex; + flex-direction: column; + align-items: center; +`; + +const Select = styled.select` + background-color: ${colorWhite}; + width: 50%; + margin: 1rem; + border-color: ${colorGrayLighter}; +`; + +export default { + SelectParent, + Select, +}; diff --git a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/styles.scss b/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/styles.scss deleted file mode 100755 index fc38af1811..0000000000 --- a/bigbluebutton-html5/imports/ui/components/breakout-join-confirmation/styles.scss +++ /dev/null @@ -1,12 +0,0 @@ -.selectParent { - display: flex; - flex-direction: column; - align-items: center; -} - -.select { - background-color: var(--color-white); - width: 50%; - margin: 1rem; - border-color: var(--color-gray-lighter); -} diff --git a/bigbluebutton-html5/imports/ui/components/debug-window/component.jsx b/bigbluebutton-html5/imports/ui/components/debug-window/component.jsx index b5e60411d0..c90b114600 100644 --- a/bigbluebutton-html5/imports/ui/components/debug-window/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/debug-window/component.jsx @@ -1,10 +1,7 @@ import React, { Component } from 'react'; import Draggable from 'react-draggable'; -import Resizable from 're-resizable'; import { defineMessages, injectIntl } from 'react-intl'; -import { styles } from './styles.scss'; -import Icon from '/imports/ui/components/icon/component'; -import Button from '/imports/ui/components/button/component'; +import Styled from './styles'; import ChatLogger from '/imports/ui/components/chat/chat-logger/ChatLogger'; const intlMessages = defineMessages({ @@ -87,10 +84,10 @@ class DebugWindow extends Component { const { intl } = this.props; return ( - + {status ? intl.formatMessage(intlMessages.on) : intl.formatMessage(intlMessages.off)} - + ); } @@ -108,8 +105,7 @@ class DebugWindow extends Component { bounds="body" enableUserSelectHack={false} > - -
-
- -
+ + + + {intl.formatMessage(intlMessages.debugWindowTitle)} -
-
-
-
-
-
+ + + + + {`${intl.formatMessage(intlMessages.userAgentLabel)}:`} -
-
- + + {`${intl.formatMessage(intlMessages.copyButtonLabel)}`} -
-
-
-
+ + + + {`${intl.formatMessage(intlMessages.chatLoggerLabel)}:`} -
-
-
+ + +