coop-cloud-chaos-patchs/outline
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Combine modals

Browse Source
This commit is contained in:
Tom Moor
2017-09-30 19:59:08 -07:00
parent d015d37f53
commit 6b5fef4954
6 changed files with 61 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/components/Layout/Layout.js
View File

@ -73,11 +73,6 @@ type Props = {
this.props.ui.setActiveModal('keyboard-shortcuts');
}
@keydown('shift+3')
openMarkdownShortcuts() {
this.props.ui.setActiveModal('markdown-shortcuts');
}
handleCreateCollection = () => {
this.props.ui.setActiveModal('collection-new');
};

4
frontend/components/Layout/components/Modals.js
View File

@ -8,7 +8,6 @@ import CollectionEdit from 'scenes/CollectionEdit';
import CollectionDelete from 'scenes/CollectionDelete';
import DocumentDelete from 'scenes/DocumentDelete';
import KeyboardShortcuts from 'scenes/KeyboardShortcuts';
import MarkdownShortcuts from 'scenes/MarkdownShortcuts';
import Settings from 'scenes/Settings';
@observer class Modals extends Component {
@ -52,9 +51,6 @@ import Settings from 'scenes/Settings';
<Modal name="keyboard-shortcuts" title="Keyboard shortcuts">
<KeyboardShortcuts />
</Modal>
<Modal name="markdown-shortcuts" title="Markdown formatting">
<MarkdownShortcuts />
</Modal>
<Modal name="settings" title="Settings">
<Settings />
</Modal>

69
frontend/scenes/KeyboardShortcuts/KeyboardShortcuts.js
View File

@ -10,18 +10,13 @@ function KeyboardShortcuts() {
<Flex column>
<HelpText>
Atlas is designed to be super fast and easy to use.
All of your usual keyboard shortcuts work here.
All of your usual keyboard shortcuts work here, and there
{"'"}
s Markdown too.
</HelpText>
<h2>Navigation</h2>
<List>
<Keys><Key>Cmd</Key> + <Key>Enter</Key></Keys>
<Label>Save and exit document edit mode</Label>
<Keys><Key>Cmd</Key> + <Key>S</Key></Keys>
<Label>Save document and continue editing</Label>
<Keys><Key>Cmd</Key> + <Key>Esc</Key></Keys>
<Label>Cancel editing</Label>
<Keys><Key>e</Key></Keys>
<Label>Edit current document</Label>
@ -36,9 +31,59 @@ function KeyboardShortcuts() {
<Keys><Key>?</Key></Keys>
<Label>Open this guide</Label>
</List>
<Keys><Key>#</Key></Keys>
<Label>Open markdown guide</Label>
<h2>Editor</h2>
<List>
<Keys><Key>Cmd</Key> + <Key>Enter</Key></Keys>
<Label>Save and exit document edit mode</Label>
<Keys><Key>Cmd</Key> + <Key>S</Key></Keys>
<Label>Save document and continue editing</Label>
<Keys><Key>Cmd</Key> + <Key>Esc</Key></Keys>
<Label>Cancel editing</Label>
<Keys><Key>Cmd</Key> + <Key>b</Key></Keys>
<Label>Bold</Label>
<Keys><Key>Cmd</Key> + <Key>i</Key></Keys>
<Label>Italic</Label>
<Keys><Key>Cmd</Key> + <Key>u</Key></Keys>
<Label>Underline</Label>
<Keys><Key>Cmd</Key> + <Key>z</Key></Keys>
<Label>Undo</Label>
<Keys><Key>Cmd</Key> + <Key>Shift</Key> + <Key>z</Key></Keys>
<Label>Redo</Label>
</List>
<h2>Markdown</h2>
<List>
<Keys><Key>#</Key> <Key>Space</Key></Keys>
<Label>Large header</Label>
<Keys><Key>##</Key> <Key>Space</Key></Keys>
<Label>Medium header</Label>
<Keys><Key>###</Key> <Key>Space</Key></Keys>
<Label>Small header</Label>
<Keys><Key>1.</Key> <Key>Space</Key></Keys>
<Label>Numbered list</Label>
<Keys><Key>-</Key> <Key>Space</Key></Keys>
<Label>Bulleted list</Label>
<Keys><Key>[ ]</Key> <Key>Space</Key></Keys>
<Label>Todo list</Label>
<Keys><Key>&gt;</Key> <Key>Space</Key></Keys>
<Label>Blockquote</Label>
<Keys><Key>---</Key></Keys>
<Label>Horizontal divider</Label>
<Keys><Key>{'```'}</Key></Keys>
<Label>Code block</Label>
<Keys>_italic_</Keys>
<Label>Italic</Label>
<Keys>**bold**</Keys>
<Label>Bold</Label>
<Keys>~~strikethrough~~</Keys>
<Label>Strikethrough</Label>
<Keys>{'`code`'}</Keys>
<Label>Inline code</Label>
</List>
</Flex>
);

71
frontend/scenes/MarkdownShortcuts/MarkdownShortcuts.js
View File

@ -1,71 +0,0 @@
// @flow
import React from 'react';
import styled from 'styled-components';
import Key from 'components/Key';
import Flex from 'components/Flex';
import HelpText from 'components/HelpText';
function MarkdownShortcuts() {
return (
<Flex column>
<HelpText>
Know a little markdown syntax? You
{"'"}
re going to love all of the markdown
shortcuts built right into the Atlas editor.
</HelpText>
<List>
<Keys><Key>#</Key> <Key>Space</Key></Keys>
<Label>Large header</Label>
<Keys><Key>##</Key> <Key>Space</Key></Keys>
<Label>Medium header</Label>
<Keys><Key>###</Key> <Key>Space</Key></Keys>
<Label>Small header</Label>
<Keys><Key>1.</Key> <Key>Space</Key></Keys>
<Label>Numbered list</Label>
<Keys><Key>-</Key> <Key>Space</Key></Keys>
<Label>Bulleted list</Label>
<Keys><Key>[ ]</Key> <Key>Space</Key></Keys>
<Label>Todo list</Label>
<Keys><Key>&gt;</Key> <Key>Space</Key></Keys>
<Label>Blockquote</Label>
<Keys><Key>---</Key></Keys>
<Label>Horizontal divider</Label>
<Keys><Key>{'```'}</Key></Keys>
<Label>Code block</Label>
<Keys>_italic_</Keys>
<Label>Italic</Label>
<Keys>**bold**</Keys>
<Label>Bold</Label>
<Keys>~~strikethrough~~</Keys>
<Label>Strikethrough</Label>
<Keys>{'`code`'}</Keys>
<Label>Inline code</Label>
</List>
</Flex>
);
}
const List = styled.dl`
width: 100%;
overflow: hidden;
padding: 0;
margin: 0
`;
const Keys = styled.dt`
float: left;
width: 25%;
padding: 0 0 4px;
margin: 0
`;
const Label = styled.dd`
float: left;
width: 75%;
padding: 0 0 4px;
margin: 0
`;
export default MarkdownShortcuts;

3
frontend/scenes/MarkdownShortcuts/index.js
View File

@ -1,3 +0,0 @@
// @flow
import MarkdownShortcuts from './MarkdownShortcuts';
export default MarkdownShortcuts;

4
frontend/styles/base.css
View File

@ -137,3 +137,7 @@ hr {
.activeDropZone a {
color: #FFF !important;
}
.ReactModal__Body--open {
overflow: hidden;
}