Mirrors/edumeet
1
0
Fork 0
mirror of https://github.com/edumeet/edumeet.git synced 2026-01-23 10:36:11 +00:00
Code Issues Projects Releases Wiki Activity

Standarize colors

Browse source
This commit is contained in:
Roman Drozd 2020-10-30 01:58:26 +01:00
parent 8d6565d226
commit 8056e9cff7
4 changed files with 63 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

56
app/public/config/config.example.js
View file

@ -47,9 +47,9 @@ var config =
// the screen. This is changeable in client settings.
// This value must match one of the defined values in
// viewAspectRatios EXACTLY (e.g. 1.333)
viewAspectRatio : 1.777,
viewAspectRatio : 1.777,
// These are the selectable aspect ratios in the settings
viewAspectRatios : [ {
viewAspectRatios : [ {
value : 1.333, // 4 / 3
label : '4 : 3'
}, {
@ -175,6 +175,47 @@ var config =
backgroundColor : '#313131'
}
},
MuiButton :
{
containedPrimary :
{
backgroundColor : '#5F9B2D',
'&:hover' :
{
backgroundColor : '#5F9B2D'
}
},
containedSecondary :
{
backgroundColor : '#f50057',
'&:hover' :
{
backgroundColor : '#f50057'
}
}
},
MuIconButton :
{
colorPrimary :
{
backgroundColor : '#5F9B2D',
'&:hover' :
{
backgroundColor : '#5F9B2D'
}
},
colorSecondary :
{
backgroundColor : '#f50057',
'&:hover' :
{
backgroundColor : '#f50057'
}
}
},
MuiFab :
{
primary :
@ -182,9 +223,18 @@ var config =
backgroundColor : '#5F9B2D',
'&:hover' :
{
backgroundColor : '#518029'
backgroundColor : '#5F9B2D'
}
},
secondary :
{
backgroundColor : '#f50057',
'&:hover' :
{
backgroundColor : '#f50057'
}
}
},
MuiBadge :
{

11
app/src/components/Containers/Me.js
View file

@ -530,9 +530,8 @@ const Me = (props) =>
}
color={micState === 'on' ?
settings.voiceActivatedUnmute ?
me.isAutoMuted ? 'secondary'
: 'primary'
: 'default'
me.isAutoMuted ? 'secondary' : 'primary'
: 'primary'
: 'secondary'
}
size='large'
@ -624,7 +623,7 @@ const Me = (props) =>
!hasVideoPermission ||
me.webcamInProgress
}
color={webcamState === 'on' ? 'default' : 'secondary'}
color={webcamState === 'on' ? 'primary' : 'secondary'}
size='large'
onClick={() =>
{
@ -661,7 +660,7 @@ const Me = (props) =>
!me.canShareScreen ||
me.screenShareInProgress
}
color='primary'
color={screenState === 'on' ? 'primary' : 'secondary'}
size='small'
onClick={() =>
{
@ -687,7 +686,7 @@ const Me = (props) =>
!me.canShareScreen ||
me.screenShareInProgress
}
color={screenState === 'on' ? 'primary' : 'default'}
color={screenState === 'on' ? 'primary' : 'secondary'}
size='large'
onClick={() =>
{

6
app/src/components/Controls/ButtonControlBar.js
View file

@ -218,7 +218,7 @@ const ButtonControlBar = (props) =>
})}
className={classes.fab}
disabled={!me.canSendMic || me.audioInProgress}
color={micState === 'on' ? 'default' : 'secondary'}
color={micState === 'on' ? 'primary' : 'secondary'}
size={smallScreen ? 'large' : 'medium'}
onClick={() =>
{
@ -245,7 +245,7 @@ const ButtonControlBar = (props) =>
})}
className={classes.fab}
disabled={!me.canSendWebcam || me.webcamInProgress}
color={webcamState === 'on' ? 'default' : 'secondary'}
color={webcamState === 'on' ? 'primary' : 'secondary'}
size={smallScreen ? 'large' : 'medium'}
onClick={() =>
{
@ -270,7 +270,7 @@ const ButtonControlBar = (props) =>
})}
className={classes.fab}
disabled={!me.canShareScreen || me.screenShareInProgress}
color={screenState === 'on' ? 'primary' : 'default'}
color={screenState === 'on' ? 'primary' : 'secondary'}
size={smallScreen ? 'large' : 'medium'}
onClick={() =>
{

4
app/src/components/JoinDialog.js
View file

@ -102,7 +102,7 @@ const styles = (theme) =>
},
green :
{
color : 'rgba(0, 153, 0, 1)'
color : '#5F9B2D'
},
red :
{
@ -504,7 +504,7 @@ const JoinDialog = ({
<Button
onClick={handleJoin}
variant='contained'
className={classes.joinButton}
color='primary'
id='joinButton'
>
<FormattedMessage