From aa2255a03c605fbb6303298ef1ab462a088239d7 Mon Sep 17 00:00:00 2001 From: cudr Date: Fri, 15 May 2020 22:43:19 +0300 Subject: [PATCH] feat: update site styles --- packages/backend/package.json | 4 ++-- packages/bridge/package.json | 2 +- packages/client/package.json | 4 ++-- packages/example/package.json | 4 ++-- packages/example/public/index.html | 7 +++++-- packages/example/src/App.tsx | 3 ++- packages/example/src/Client.tsx | 14 ++++++++------ packages/example/src/Components.tsx | 22 ++++++++++++++-------- 8 files changed, 36 insertions(+), 24 deletions(-) diff --git a/packages/backend/package.json b/packages/backend/package.json index 470a3b7..ffc8be2 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/backend", - "version": "0.6.0", + "version": "0.6.1", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/runtime": "^7.6.3", - "@slate-collaborative/bridge": "0.6.0", + "@slate-collaborative/bridge": "0.6.1", "@types/lodash": "^4.14.150", "@types/socket.io": "^2.1.4", "automerge": "0.14.0", diff --git a/packages/bridge/package.json b/packages/bridge/package.json index ff90aa9..643e00e 100644 --- a/packages/bridge/package.json +++ b/packages/bridge/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/bridge", - "version": "0.6.0", + "version": "0.6.1", "files": [ "lib" ], diff --git a/packages/client/package.json b/packages/client/package.json index b3da8cb..5ffee96 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@slate-collaborative/client", - "version": "0.6.0", + "version": "0.6.1", "files": [ "lib" ], @@ -26,7 +26,7 @@ "dependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/preset-react": "^7.0.0", - "@slate-collaborative/bridge": "0.6.0", + "@slate-collaborative/bridge": "0.6.1", "automerge": "0.14.0", "slate": "0.58.0", "socket.io-client": "^2.3.0", diff --git a/packages/example/package.json b/packages/example/package.json index b73d83d..ff24994 100644 --- a/packages/example/package.json +++ b/packages/example/package.json @@ -5,8 +5,8 @@ "dependencies": { "@emotion/core": "^10.0.17", "@emotion/styled": "^10.0.17", - "@slate-collaborative/backend": "^0.6.0", - "@slate-collaborative/client": "^0.6.0", + "@slate-collaborative/backend": "^0.6.1", + "@slate-collaborative/client": "^0.6.1", "@types/faker": "^4.1.5", "@types/jest": "24.0.18", "@types/node": "12.7.5", diff --git a/packages/example/public/index.html b/packages/example/public/index.html index 1a294f3..ae8656d 100644 --- a/packages/example/public/index.html +++ b/packages/example/public/index.html @@ -3,7 +3,10 @@ - + - Slate collaborative + Slate-collaborative. Collaboration plugin and microservice diff --git a/packages/example/src/App.tsx b/packages/example/src/App.tsx index 9ca373e..4f1400c 100644 --- a/packages/example/src/App.tsx +++ b/packages/example/src/App.tsx @@ -49,7 +49,8 @@ const Button = styled.button` ` const AddButton = styled(Button)` - margin-left: 30px; + margin-left: 0px; color: violet; + margin-bottom: 10px; border: 2px solid violet; ` diff --git a/packages/example/src/Client.tsx b/packages/example/src/Client.tsx index 26a3f6c..b2d5fbf 100644 --- a/packages/example/src/Client.tsx +++ b/packages/example/src/Client.tsx @@ -93,12 +93,14 @@ const Client: React.FC = ({ id, name, slug, removeUser }) => { <Head>Editor: {name}</Head> - <Button type="button" onClick={toggleOnline}> - Go {isOnline ? 'offline' : 'online'} - </Button> - <Button type="button" onClick={() => removeUser(id)}> - Remove - </Button> + <div style={{ display: 'flex', marginTop: 10, marginBottom: 10 }}> + <Button type="button" onClick={toggleOnline}> + Go {isOnline ? 'offline' : 'online'} + </Button> + <Button type="button" onClick={() => removeUser(id)}> + Remove + </Button> + </div> ` background: ${props => props.online ? 'rgba(128, 128, 128, 0.1)' : 'rgba(247, 0, 0, 0.2)'}; - padding: 20px 30px 40px; + padding: 20px 20px 30px; ` export const ClientFrame = styled.div`