Added logo and styling options

master
Håvar Aambø Fosstveit 2019-04-01 10:53:44 +02:00
parent 4d21e7b4e9
commit 9b78a81ef0
7 changed files with 26 additions and 33 deletions

1
.gitignore vendored
View File

@ -2,6 +2,7 @@ node_modules/
/app/build/ /app/build/
/app/public/config.js /app/public/config.js
/app/public/images/logo.*
/server/config/ /server/config/
!/server/config/config.example.js !/server/config/config.example.js
/server/public/ /server/public/

View File

@ -15,7 +15,7 @@
top: 40%; top: 40%;
width: 90%; width: 90%;
transform: translate(-50%, 0%); transform: translate(-50%, 0%);
background-image: url('/images/background.svg'); background-image: url('/images/background.jpg');
background-attachment: fixed; background-attachment: fixed;
background-position: center; background-position: center;
background-size: cover; background-size: cover;

View File

@ -1,3 +1,4 @@
// eslint-disable-next-line
var config = var config =
{ {
loginEnabled : false, loginEnabled : false,
@ -17,6 +18,9 @@ var config =
tcp : true tcp : true
}, },
lastN : 4, lastN : 4,
background : 'images/background.jpg',
// Add file and uncomment for adding logo to appbar
// logo : 'images/logo.svg',
theme : theme :
{ {
palette : palette :

Binary file not shown.

After

Width:  |  Height:  |  Size: 88 KiB

File diff suppressed because one or more lines are too long

Before

Width:  |  Height:  |  Size: 313 KiB

View File

@ -44,7 +44,13 @@ const styles = (theme) =>
{ {
display : 'flex', display : 'flex',
width : '100%', width : '100%',
height : '100%' height : '100%',
backgroundColor : 'var(--background-color)',
backgroundImage : `url(${window.config.background})`,
backgroundAttachment : 'fixed',
backgroundPosition : 'center',
backgroundSize : 'cover',
backgroundRepeat : 'no-repeat'
}, },
message : message :
{ {
@ -60,6 +66,10 @@ const styles = (theme) =>
margin : 0, margin : 0,
padding : 0 padding : 0
}, },
logo :
{
marginLeft : 20
},
show : show :
{ {
opacity : 1, opacity : 1,
@ -288,6 +298,10 @@ class Room extends React.PureComponent
<MenuIcon /> <MenuIcon />
</IconButton> </IconButton>
</Badge> </Badge>
{ window.config.logo ?
<img alt='Logo' className={classes.logo} src={window.config.logo} />
:null
}
<Typography <Typography
className={classes.title} className={classes.title}
variant='h6' variant='h6'

View File

@ -1,13 +1,6 @@
:root { :root {
--background: url('./images/background.jpg');
--background-color: rgba(114, 119, 143, 1.0); --background-color: rgba(114, 119, 143, 1.0);
--circle-button-color: rgba(255, 255, 255, 0.3);
--circle-button-toggled-color: rgba(255, 255, 255, 0.7);
--circle-button-unsupported-color: rgba(212, 34, 65, 0.7);
--circle-button-diabled-color: rgba(255, 255, 255, 0.5);
--circle-button-size: 2.5em;
--media-control-button-color: rgba(255, 255, 255, 0.85); --media-control-button-color: rgba(255, 255, 255, 0.85);
--media-control-botton-on: rgba(255, 255, 255, 0.7); --media-control-botton-on: rgba(255, 255, 255, 0.7);
--media-control-botton-off: rgba(212, 34, 65, 0.7); --media-control-botton-off: rgba(212, 34, 65, 0.7);
@ -25,18 +18,6 @@
--peer-bg-color: rgba(42, 75, 88, 0.9); --peer-bg-color: rgba(42, 75, 88, 0.9);
--peer-video-bg-color: rgba(0, 0, 0, 0.75); --peer-video-bg-color: rgba(0, 0, 0, 0.75);
--chat-message-color: rgba(0, 0, 0, 0.1);
--chat-input-bg-color: rgba(255, 255, 255, 1.0);
--chat-input-text-color: rgba(0, 0, 0, 1.0);
--chat-send-bg-color: rgba(170, 238, 255, 1.0);
--filesharing-bg-color: rgba(170, 238, 255, 1.0);
--notification-info-bg-color: rgba(10, 29, 38, 0.75);
--notification-info-text-color: rgba(255, 255, 255, 0.65);
--notification-error-bg-color: rgba(255, 25, 20, 0.65);
--notification-error-text-color: rgba(255, 255, 255, 0.85);
--active-speaker-border-color: rgba(255, 255, 255, 1.0); --active-speaker-border-color: rgba(255, 255, 255, 1.0);
--selected-peer-border-color: rgba(55, 126, 255, 1.0); --selected-peer-border-color: rgba(55, 126, 255, 1.0);
} }
@ -54,12 +35,6 @@ body
height: 100%; height: 100%;
width: 100%; width: 100%;
font-size: 16px; font-size: 16px;
background-color: var(--background-color);
background-image: var(--background);
background-attachment: fixed;
background-position: center;
background-size: cover;
background-repeat: no-repeat;
} }
#multiparty-meeting #multiparty-meeting