From 62486acfd1429d2769f82644a9c8a319f31f78da Mon Sep 17 00:00:00 2001 From: Matthew Harrison-Jones <matthojo@gmail.com> Date: Thu, 25 Jul 2013 11:49:02 +0100 Subject: [PATCH 1/2] Improved Markdown help modal --- core/client/assets/sass/layouts/editor.scss | 8 ++ core/client/tpl/modals/markdown.hbs | 108 +++++++++++++++++++- 2 files changed, 115 insertions(+), 1 deletion(-) diff --git a/core/client/assets/sass/layouts/editor.scss b/core/client/assets/sass/layouts/editor.scss index 7c1a28d98f..fcf92fccf8 100644 --- a/core/client/assets/sass/layouts/editor.scss +++ b/core/client/assets/sass/layouts/editor.scss @@ -526,6 +526,14 @@ body.zen { right:-5px; } +/* ============================================================================= + Markdown Help Modal + ============================================================================= */ + +.modal-markdown-help-table { + margin-top: 0; +} + /* ============================================================================= CodeMirror ============================================================================= */ diff --git a/core/client/tpl/modals/markdown.hbs b/core/client/tpl/modals/markdown.hbs index 2d51ee07e3..ed631eb64f 100644 --- a/core/client/tpl/modals/markdown.hbs +++ b/core/client/tpl/modals/markdown.hbs @@ -1 +1,107 @@ -For now reference: <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Documentation</a> \ No newline at end of file +<table class="modal-markdown-help-table"> + <thead> + <tr> + <th>Result</th> + <th>Markdown</th> + <th>Shortcut</th> + </tr> + </thead> + <tbody> + <tr> + <td><strong>Bold</strong></td> + <td>**text**</td> + <td>Ctrl / Cmd + B</td> + </tr> + <tr> + <td><em>Emphasize</em></td> + <td>__text__</td> + <td>Ctrl / Cmd + I</td> + </tr> + <tr> + <td><code>Inline Code</code></td> + <td>`code`</td> + <td>Cmd + K / Ctrl + Shift + K</td> + </tr> + <tr> + <td>Strike-through</td> + <td>~~text~~</td> + <td>Ctrl + Alt + U</td> + </tr> + <tr> + <td><a href="#">Link</a></td> + <td>[title](http://)</td> + <td>Ctrl + Shift + L</td> + </tr> + <tr> + <td>Image</td> + <td>!image[image](http://)</td> + <td>Ctrl + Shift + I</td> + </tr> + <tr> + <td>List</td> + <td>* item</td> + <td>Ctrl + L</td> + </tr> + <tr> + <td>Blockquote</td> + <td>> quote</td> + <td>Ctrl + Q</td> + </tr> + <tr> + <td>H1</td> + <td># Heading</td> + <td>Alt + 1</td> + </tr> + <tr> + <td>H2</td> + <td>## Heading</td> + <td>Alt + 2</td> + </tr> + <tr> + <td>H3</td> + <td>### Heading</td> + <td>Alt + 3</td> + </tr> + <tr> + <td>H4</td> + <td>#### Heading</td> + <td>Alt + 4</td> + </tr> + <tr> + <td>H5</td> + <td>##### Heading</td> + <td>Alt + 5</td> + </tr> + <tr> + <td>H6</td> + <td>###### Heading</td> + <td>Alt + 6</td> + </tr> + <tr> + <td>Select Word</td> + <td></td> + <td>Ctrl + Option + W</td> + </tr> + <tr> + <td>Uppercase</td> + <td></td> + <td>Ctrl + U</td> + </tr> + <tr> + <td>Lowercase</td> + <td></td> + <td>Ctrl + Shift + U</td> + </tr> + <tr> + <td>Titlecase</td> + <td></td> + <td>Ctrl + Option + Shift + U</td> + </tr> + <tr> + <td>Insert Current Date</td> + <td></td> + <td>Ctrl + Shift + 1</td> + </tr> + </tbody> +</table> +For further Markdown syntax reference: <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Documentation</a> \ No newline at end of file From 17c582ce51be8b545cff2ace1e7a6a5f41f47c33 Mon Sep 17 00:00:00 2001 From: Matthew Harrison-Jones <matthojo@gmail.com> Date: Thu, 25 Jul 2013 11:53:19 +0100 Subject: [PATCH 2/2] Fixed modal max-height not working --- core/client/assets/sass/modules/global.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client/assets/sass/modules/global.scss b/core/client/assets/sass/modules/global.scss index 3b0aabf3d0..f2d110c66b 100644 --- a/core/client/assets/sass/modules/global.scss +++ b/core/client/assets/sass/modules/global.scss @@ -914,7 +914,7 @@ body.blur > *:not(#modal-container) { %modal, .modal { @include box-sizing(border-box); - max-height: calc(100%-80px); + max-height: 90%; width: 450px; padding: 0px; background: #FFFFFF;