BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/v2.5.x-release' into 25-dev-apr19

Browse Source
This commit is contained in:
Ramon Souza 2022-04-19 11:34:29 -03:00
commit 76272d8a51
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bigbluebutton-html5/imports/ui/components/user-list/user-list-content/user-participants/user-list-item/component.jsx
View File

@ -211,9 +211,9 @@ class UserListItem extends PureComponent {
componentDidUpdate() {
const { user, selectedUserId } = this.props;
const { selected } = this.state;
if (selectedUserId === user.userId && !selected) {
if (selectedUserId === user?.userId && !selected) {
this.setState({ selected: true });
} else if (selectedUserId !== user.userId && selected) {
} else if (selectedUserId !== user?.userId && selected) {
this.setState({ selected: false });
}
}

10
bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/styles.js
View File

@ -6,7 +6,7 @@ import {
colorDanger,
colorWhite,
colorGrayDark,
colorGrayLighter,
toolbarButtonBorderColor,
} from '/imports/ui/stylesheets/styled-components/palette';
import {
toolbarButtonWidth,
@ -16,6 +16,8 @@ import {
smPaddingX,
toolbarMargin,
toolbarButtonBorderRadius,
toolbarItemOutlineOffset,
toolbarButtonBorder,
} from '/imports/ui/stylesheets/styled-components/general';
import { smallOnly } from '/imports/ui/stylesheets/styled-components/breakpoints';
@ -87,11 +89,11 @@ const ToolbarWrapper = styled.div`
pointer-events: all;
.toolbarButtonWrapper > button {
outline-offset: -.19rem;
border-bottom: 1px solid ${colorGrayLighter};
outline-offset: ${toolbarItemOutlineOffset};
border-bottom: ${toolbarButtonBorder} solid ${toolbarButtonBorderColor};
}
.toolbarButtonWrapper:first-child > button {
& > .toolbarButtonWrapper:first-child > button {
border-top-left-radius: ${toolbarButtonBorderRadius};
border-top-right-radius: ${toolbarButtonBorderRadius};

18
bigbluebutton-html5/imports/ui/components/whiteboard/whiteboard-toolbar/toolbar-menu-item/styles.js
View File

@ -3,8 +3,6 @@ import styled from 'styled-components';
import {
toolbarButtonWidth,
toolbarButtonHeight,
toolbarItemOutlineOffset,
toolbarButtonBorder,
toolbarButtonBorderRadius,
toolbarItemTrianglePadding,
} from '/imports/ui/stylesheets/styled-components/general';
@ -25,22 +23,6 @@ const ButtonWrapper = styled.div`
min-height: ${toolbarButtonHeight};
position: relative;
& > button {
outline-offset: ${toolbarItemOutlineOffset};
border-bottom: ${toolbarButtonBorder} solid ${toolbarButtonBorderColor};
}
&:first-child > button {
border-top-left-radius: ${toolbarButtonBorderRadius};
border-top-right-radius: ${toolbarButtonBorderRadius};
}
&:last-child > button {
border-bottom: 0;
border-bottom-left-radius: ${toolbarButtonBorderRadius};
border-bottom-right-radius: ${toolbarButtonBorderRadius};
}
${({ showCornerTriangle }) => showCornerTriangle && `
&::before {
content: '';