Merge branch 'develop' of github.com:havfo/multiparty-meeting into develop

This commit is contained in:
Håvar Aambø Fosstveit
2020-04-07 19:47:47 +02:00
15 changed files with 363 additions and 23 deletions
+3 -3
View File
@@ -78,8 +78,8 @@ const styles = (theme) =>
},
actionButton :
{
margin : theme.spacing(1),
padding : 0
margin : theme.spacing(1, 0),
padding : theme.spacing(0, 1)
}
});
@@ -446,4 +446,4 @@ export default withRoomContext(connect(
);
}
}
)(withStyles(styles, { withTheme: true })(TopBar)));
)(withStyles(styles, { withTheme: true })(TopBar)));