Archives/cudr_slate-collaborative
1
0
Fork 0
mirror of https://github.com/cudr/slate-collaborative.git synced 2025-06-13 12:54:04 +00:00
Code Issues Projects Releases Wiki Activity

feat: update site styles

Browse Source
This commit is contained in:
cudr 2020-05-15 22:43:19 +03:00
parent aaa6d1fa54
commit aa2255a03c
8 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@slate-collaborative/backend", "name": "@slate-collaborative/backend",
"version": "0.6.0", "version": "0.6.1",
"files": [ "files": [
"lib" "lib"
], ],
@ -26,7 +26,7 @@
"dependencies": { "dependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/plugin-proposal-optional-chaining": "^7.9.0",
"@babel/runtime": "^7.6.3", "@babel/runtime": "^7.6.3",
"@slate-collaborative/bridge": "0.6.0", "@slate-collaborative/bridge": "0.6.1",
"@types/lodash": "^4.14.150", "@types/lodash": "^4.14.150",
"@types/socket.io": "^2.1.4", "@types/socket.io": "^2.1.4",
"automerge": "0.14.0", "automerge": "0.14.0",

2
packages/bridge/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@slate-collaborative/bridge", "name": "@slate-collaborative/bridge",
"version": "0.6.0", "version": "0.6.1",
"files": [ "files": [
"lib" "lib"
], ],

4
packages/client/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@slate-collaborative/client", "name": "@slate-collaborative/client",
"version": "0.6.0", "version": "0.6.1",
"files": [ "files": [
"lib" "lib"
], ],
@ -26,7 +26,7 @@
"dependencies": { "dependencies": {
"@babel/plugin-proposal-optional-chaining": "^7.9.0", "@babel/plugin-proposal-optional-chaining": "^7.9.0",
"@babel/preset-react": "^7.0.0", "@babel/preset-react": "^7.0.0",
"@slate-collaborative/bridge": "0.6.0", "@slate-collaborative/bridge": "0.6.1",
"automerge": "0.14.0", "automerge": "0.14.0",
"slate": "0.58.0", "slate": "0.58.0",
"socket.io-client": "^2.3.0", "socket.io-client": "^2.3.0",

4
packages/example/package.json
View File

@ -5,8 +5,8 @@
"dependencies": { "dependencies": {
"@emotion/core": "^10.0.17", "@emotion/core": "^10.0.17",
"@emotion/styled": "^10.0.17", "@emotion/styled": "^10.0.17",
"@slate-collaborative/backend": "^0.6.0", "@slate-collaborative/backend": "^0.6.1",
"@slate-collaborative/client": "^0.6.0", "@slate-collaborative/client": "^0.6.1",
"@types/faker": "^4.1.5", "@types/faker": "^4.1.5",
"@types/jest": "24.0.18", "@types/jest": "24.0.18",
"@types/node": "12.7.5", "@types/node": "12.7.5",

7
packages/example/public/index.html
View File

@ -3,7 +3,10 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" /> <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta
name="viewport"
content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"
/>
<meta name="theme-color" content="#db7093" /> <meta name="theme-color" content="#db7093" />
<meta <meta
name="description" name="description"
@ -17,7 +20,7 @@
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" /> <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>Slate collaborative</title> <title>Slate-collaborative. Collaboration plugin and microservice</title>
</head> </head>
<body> <body>
<noscript></noscript> <noscript></noscript>

3
packages/example/src/App.tsx
View File

@ -49,7 +49,8 @@ const Button = styled.button`
` `
const AddButton = styled(Button)` const AddButton = styled(Button)`
margin-left: 30px; margin-left: 0px;
color: violet; color: violet;
margin-bottom: 10px;
border: 2px solid violet; border: 2px solid violet;
` `

14
packages/example/src/Client.tsx
View File

@ -93,12 +93,14 @@ const Client: React.FC<ClientProps> = ({ id, name, slug, removeUser }) => {
<Instance online={isOnline}> <Instance online={isOnline}>
<Title> <Title>
<Head>Editor: {name}</Head> <Head>Editor: {name}</Head>
<Button type="button" onClick={toggleOnline}> <div style={{ display: 'flex', marginTop: 10, marginBottom: 10 }}>
Go {isOnline ? 'offline' : 'online'} <Button type="button" onClick={toggleOnline}>
</Button> Go {isOnline ? 'offline' : 'online'}
<Button type="button" onClick={() => removeUser(id)}> </Button>
Remove <Button type="button" onClick={() => removeUser(id)}>
</Button> Remove
</Button>
</div>
</Title> </Title>
<EditorFrame <EditorFrame

22
packages/example/src/Components.tsx
View File

@ -1,7 +1,7 @@
import styled from '@emotion/styled' import styled from '@emotion/styled'
export const RoomWrapper = styled.div` export const RoomWrapper = styled.div`
padding: 30px; padding-bottom: 10px;
border-bottom: 2px solid #e8e8e8; border-bottom: 2px solid #e8e8e8;
` `
@ -13,19 +13,19 @@ export const H4 = styled.h4`
export const Input = styled.input` export const Input = styled.input`
padding: 6px 14px; padding: 6px 14px;
font-size: 14px; font-size: 14px;
margin-right: 10px; margin-top: 10px;
margin-bottom: 10px;
min-width: 240px; min-width: 240px;
outline: none; outline: none;
border: 2px solid palevioletred; border: 2px solid palevioletred;
& + button { margin-right: auto;
margin-left: auto;
}
` `
export const Button = styled.button` export const Button = styled.button`
padding: 6px 14px; padding: 6px 14px;
display: block; display: block;
outline: none; outline: none;
background-color: transparent;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
color: palevioletred; color: palevioletred;
@ -46,20 +46,26 @@ export const Icon = styled.div``
export const Grid = styled.div` export const Grid = styled.div`
display: grid; display: grid;
grid-gap: 2vw; grid-gap: 1vw;
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
@media (max-width: 767px) {
grid-template-columns: 1fr;
}
` `
export const Title = styled.div` export const Title = styled.div`
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 20px; margin-bottom: 10px;
@media (max-width: 767px) {
flex-wrap: wrap;
}
` `
export const Instance = styled.div<{ online: boolean }>` export const Instance = styled.div<{ online: boolean }>`
background: ${props => background: ${props =>
props.online ? 'rgba(128, 128, 128, 0.1)' : 'rgba(247, 0, 0, 0.2)'}; 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` export const ClientFrame = styled.div`