Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion css/_base.scss
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ body {

.jitsi-icon {
&-default svg {
fill: white;
fill: var(--icon-default-color, white);
}
}

Expand Down
2 changes: 1 addition & 1 deletion css/_mini_toolbox.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.always-on-top-toolbox {
background-color: $newToolbarBackgroundColor;
background-color: var(--toolbox-background-color, $newToolbarBackgroundColor);
border-radius: 3px;
display: flex;
z-index: $toolbarZ;
Expand Down
4 changes: 2 additions & 2 deletions css/_toolbars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Round badge.
*/
.badge-round {
background-color: #165ECC;
background-color: var(--toolbar-badge-background, #165ECC);
border-radius: 50%;
box-sizing: border-box;
color: #FFFFFF;
Expand Down Expand Up @@ -93,7 +93,7 @@

.toolbox-content-wrapper::after {
content: '';
background: $newToolbarBackgroundColor;
background: var(--toolbox-background-color, $newToolbarBackgroundColor);
padding-bottom: env(safe-area-inset-bottom, 0);
}

Expand Down
2 changes: 1 addition & 1 deletion css/premeeting/_lobby.scss
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
}

#notification-participant-list {
background-color: $newToolbarBackgroundColor;
background-color: var(--toolbox-background-color, $newToolbarBackgroundColor);
border: 1px solid rgba(255, 255, 255, .4);
border-radius: 8px;
left: 0;
Expand Down
10 changes: 5 additions & 5 deletions react/features/base/label/components/web/Label.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@ const useStyles = makeStyles()(theme => {
label: {
...theme.typography.labelRegular,
alignItems: 'center',
background: theme.palette.ui04,
background: theme.palette.labelBackground,
borderRadius: '4px',
color: theme.palette.text01,
color: theme.palette.labelText,
display: 'flex',
margin: '0 2px',
padding: '6px',
Expand All @@ -72,11 +72,11 @@ const useStyles = makeStyles()(theme => {
cursor: 'pointer'
},
[COLORS.white]: {
background: theme.palette.ui09,
color: theme.palette.text04,
background: theme.palette.labelWhiteBackground,
color: theme.palette.labelWhiteText,

'& svg': {
fill: theme.palette.icon04
fill: theme.palette.labelWhiteIcon
}
},
[COLORS.green]: {
Expand Down
16 changes: 8 additions & 8 deletions react/features/base/premeeting/components/web/ActionButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const useStyles = makeStyles()(theme => {
...theme.typography.bodyLongBold,
borderRadius: theme.shape.borderRadius,
boxSizing: 'border-box',
color: theme.palette.text01,
color: theme.palette.actionButtonText,
cursor: 'pointer',
display: 'inline-block',
marginBottom: '16px',
Expand All @@ -95,20 +95,20 @@ const useStyles = makeStyles()(theme => {
border: 0,

'&.primary': {
background: theme.palette.action01,
color: theme.palette.text01,
background: theme.palette.prejoinActionButtonPrimary,
color: theme.palette.prejoinActionButtonPrimaryText,

'&:hover': {
backgroundColor: theme.palette.action01Hover
backgroundColor: theme.palette.prejoinActionButtonPrimaryHover
}
},

'&.secondary': {
background: theme.palette.action02,
color: theme.palette.text04,
background: theme.palette.prejoinActionButtonSecondary,
color: theme.palette.prejoinActionButtonSecondaryText,

'&:hover': {
backgroundColor: theme.palette.action02Hover
backgroundColor: theme.palette.prejoinActionButtonSecondaryHover
}
},

Expand All @@ -120,7 +120,7 @@ const useStyles = makeStyles()(theme => {
},

'&.disabled': {
background: theme.palette.disabled01,
background: theme.palette.prejoinActionButtonDisabled,
border: '1px solid #5E6D7A',
color: '#AFB6BC',
cursor: 'initial',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ const useStyles = makeStyles()(theme => {
position: 'absolute',
inset: '0 0 0 0',
display: 'flex',
backgroundColor: theme.palette.ui01,
backgroundColor: theme.palette.preMeetingBackground,
zIndex: 252,

'@media (max-width: 720px)': {
Expand Down Expand Up @@ -163,7 +163,7 @@ const useStyles = makeStyles()(theme => {
},
title: {
...theme.typography.heading4,
color: `${theme.palette.text01}!important`,
color: theme.palette.prejoinTitleText,
marginBottom: theme.spacing(3),
textAlign: 'center',

Expand All @@ -179,7 +179,7 @@ const useStyles = makeStyles()(theme => {

roomName: {
...theme.typography.heading5,
color: theme.palette.text01,
color: theme.palette.prejoinRoomNameText,
display: 'inline-block',
overflow: 'hidden',
textOverflow: 'ellipsis',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const useStyles = makeStyles()(theme => {
return {
warning: {
bottom: 0,
color: theme.palette.text03,
color: theme.palette.prejoinRecordingWarningText,
display: 'flex',
justifyContent: 'center',
...theme.typography.bodyShortRegular,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { setUnsafeRoomConsent } from '../../actions.web';
const useStyles = makeStyles()(theme => {
return {
warning: {
backgroundColor: theme.palette.warning01,
color: theme.palette.text04,
backgroundColor: theme.palette.prejoinWarningBackground,
color: theme.palette.prejoinWarningText,
...theme.typography.bodyShortRegular,
padding: theme.spacing(3),
borderRadius: theme.shape.borderRadius,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import { getSupportUrl } from '../../functions';
const useStyles = makeStyles()(theme => {
return {
dialog: {
backgroundColor: theme.palette.ui01,
border: `1px solid ${theme.palette.ui04}`,
backgroundColor: theme.palette.dialogBackground,
border: `1px solid ${theme.palette.inlineDialogBorder}`,
borderRadius: `${Number(theme.shape.borderRadius)}px`,
boxShadow: '0px 1px 2px rgba(41, 41, 41, 0.25)',
color: theme.palette.text01,
color: theme.palette.dialogText,
...theme.typography.bodyShortRegular,
padding: `${theme.spacing(3)} 10`,
'& .retry-button': {
Expand Down
4 changes: 2 additions & 2 deletions react/features/base/tooltip/components/Tooltip.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ interface IProps {
const useStyles = makeStyles()(theme => {
return {
container: {
backgroundColor: theme.palette.uiBackground,
backgroundColor: theme.palette.tooltipBackground,
borderRadius: '3px',
padding: theme.spacing(2),
...theme.typography.labelRegular,
color: theme.palette.text01,
color: theme.palette.tooltipText,
position: 'relative',

'&.mounting-animation': {
Expand Down
Loading