From da3233faf3cfde651323c25719d001d2e3a5144e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Tue, 25 Jun 2019 13:13:34 +0200 Subject: [PATCH] Updated API in material-ui. --- app/src/components/Containers/Me.js | 2 +- app/src/components/Containers/Peer.js | 2 +- app/src/components/JoinDialog.js | 2 +- app/src/components/MeetingDrawer/Chat/ChatInput.js | 2 +- app/src/components/MeetingDrawer/Chat/Message.js | 6 +++--- app/src/components/MeetingDrawer/Chat/MessageList.js | 2 +- app/src/components/MeetingDrawer/FileSharing/File.js | 8 ++++---- app/src/components/MeetingDrawer/FileSharing/FileList.js | 2 +- .../components/MeetingDrawer/FileSharing/FileSharing.js | 2 +- .../MeetingDrawer/ParticipantList/ParticipantList.js | 2 +- app/src/components/Room.js | 4 ++-- app/src/components/Settings/Settings.js | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js index cdb2251..947a98e 100644 --- a/app/src/components/Containers/Me.js +++ b/app/src/components/Containers/Me.js @@ -49,7 +49,7 @@ const styles = (theme) => }, fab : { - margin : theme.spacing.unit + margin : theme.spacing(1) }, viewContainer : { diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js index 01bc263..14ff783 100644 --- a/app/src/components/Containers/Peer.js +++ b/app/src/components/Containers/Peer.js @@ -48,7 +48,7 @@ const styles = (theme) => }, fab : { - margin : theme.spacing.unit + margin : theme.spacing(1) }, viewContainer : { diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index 5a99b3f..ae11771 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -15,7 +15,7 @@ const styles = (theme) => dialogPaper : { width : '20vw', - padding : theme.spacing.unit * 2, + padding : theme.spacing(2), [theme.breakpoints.down('lg')] : { width : '30vw' diff --git a/app/src/components/MeetingDrawer/Chat/ChatInput.js b/app/src/components/MeetingDrawer/Chat/ChatInput.js index 07d7fe5..bafaa20 100644 --- a/app/src/components/MeetingDrawer/Chat/ChatInput.js +++ b/app/src/components/MeetingDrawer/Chat/ChatInput.js @@ -12,7 +12,7 @@ const styles = (theme) => ({ root : { - padding : theme.spacing.unit, + padding : theme.spacing(1), display : 'flex', alignItems : 'center', borderRadius : 0 diff --git a/app/src/components/MeetingDrawer/Chat/Message.js b/app/src/components/MeetingDrawer/Chat/Message.js index f00fa01..856ac92 100644 --- a/app/src/components/MeetingDrawer/Chat/Message.js +++ b/app/src/components/MeetingDrawer/Chat/Message.js @@ -21,8 +21,8 @@ const styles = (theme) => root : { display : 'flex', - marginBottom : theme.spacing.unit, - padding : theme.spacing.unit, + marginBottom : theme.spacing(1), + padding : theme.spacing(1), flexShrink : 0 }, selfMessage : @@ -42,7 +42,7 @@ const styles = (theme) => }, content : { - marginLeft : theme.spacing.unit + marginLeft : theme.spacing(1) }, avatar : { diff --git a/app/src/components/MeetingDrawer/Chat/MessageList.js b/app/src/components/MeetingDrawer/Chat/MessageList.js index 8e174cc..cdc8809 100644 --- a/app/src/components/MeetingDrawer/Chat/MessageList.js +++ b/app/src/components/MeetingDrawer/Chat/MessageList.js @@ -14,7 +14,7 @@ const styles = (theme) => flexDirection : 'column', alignItems : 'center', overflowY : 'auto', - padding : theme.spacing.unit + padding : theme.spacing(1) } }); diff --git a/app/src/components/MeetingDrawer/FileSharing/File.js b/app/src/components/MeetingDrawer/FileSharing/File.js index 5981668..cd3a985 100644 --- a/app/src/components/MeetingDrawer/FileSharing/File.js +++ b/app/src/components/MeetingDrawer/FileSharing/File.js @@ -14,11 +14,11 @@ const styles = (theme) => display : 'flex', alignItems : 'center', width : '100%', - padding : theme.spacing.unit, + padding : theme.spacing(1), boxShadow : '0px 1px 5px 0px rgba(0, 0, 0, 0.2), 0px 2px 2px 0px rgba(0, 0, 0, 0.14), 0px 3px 1px -2px rgba(0, 0, 0, 0.12)', '&:not(:last-child)' : { - marginBottom : theme.spacing.unit + marginBottom : theme.spacing(1) } }, avatar : @@ -29,7 +29,7 @@ const styles = (theme) => text : { margin : 0, - padding : theme.spacing.unit + padding : theme.spacing(1) }, fileContent : { @@ -40,7 +40,7 @@ const styles = (theme) => { display : 'flex', alignItems : 'center', - padding : theme.spacing.unit + padding : theme.spacing(1) }, button : { diff --git a/app/src/components/MeetingDrawer/FileSharing/FileList.js b/app/src/components/MeetingDrawer/FileSharing/FileList.js index c84f265..1dcb905 100644 --- a/app/src/components/MeetingDrawer/FileSharing/FileList.js +++ b/app/src/components/MeetingDrawer/FileSharing/FileList.js @@ -15,7 +15,7 @@ const styles = (theme) => flexDirection : 'column', alignItems : 'center', overflowY : 'auto', - padding : theme.spacing.unit + padding : theme.spacing(1) } }); diff --git a/app/src/components/MeetingDrawer/FileSharing/FileSharing.js b/app/src/components/MeetingDrawer/FileSharing/FileSharing.js index 94e3966..2c33c4b 100644 --- a/app/src/components/MeetingDrawer/FileSharing/FileSharing.js +++ b/app/src/components/MeetingDrawer/FileSharing/FileSharing.js @@ -22,7 +22,7 @@ const styles = (theme) => }, button : { - margin : theme.spacing.unit + margin : theme.spacing(1) } }); diff --git a/app/src/components/MeetingDrawer/ParticipantList/ParticipantList.js b/app/src/components/MeetingDrawer/ParticipantList/ParticipantList.js index fac3e74..ffa6d8b 100644 --- a/app/src/components/MeetingDrawer/ParticipantList/ParticipantList.js +++ b/app/src/components/MeetingDrawer/ParticipantList/ParticipantList.js @@ -23,7 +23,7 @@ const styles = (theme) => list : { listStyleType : 'none', - padding : theme.spacing.unit, + padding : theme.spacing(1), boxShadow : '0 2px 5px 2px rgba(0, 0, 0, 0.2)', backgroundColor : 'rgba(255, 255, 255, 1)' }, diff --git a/app/src/components/Room.js b/app/src/components/Room.js index 6057865..040511e 100644 --- a/app/src/components/Room.js +++ b/app/src/components/Room.js @@ -60,7 +60,7 @@ const styles = (theme) => left : '50%', transform : 'translateX(-50%) translateY(-50%)', width : '30vw', - padding : theme.spacing.unit * 2, + padding : theme.spacing(2), flexDirection : 'column', justifyContent : 'center', alignItems : 'center' @@ -129,7 +129,7 @@ const styles = (theme) => }, actionButton : { - margin : theme.spacing.unit, + margin : theme.spacing(1), padding : 0 }, meContainer : diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js index 59b63c7..11411da 100644 --- a/app/src/components/Settings/Settings.js +++ b/app/src/components/Settings/Settings.js @@ -43,7 +43,7 @@ const styles = (theme) => }, setting : { - padding : theme.spacing.unit * 2 + padding : theme.spacing(2) }, formControl : {