Dan Brown

Fixed table cell p tag spacing and de-duped editor shortcuts

Also changed shortcuts to be better compatible with OSX by using the
command key.
...@@ -54,10 +54,10 @@ function registerEditorShortcuts(editor) { ...@@ -54,10 +54,10 @@ function registerEditorShortcuts(editor) {
54 } 54 }
55 55
56 // Other block shortcuts 56 // Other block shortcuts
57 - editor.addShortcut('ctrl+q', '', ['FormatBlock', false, 'blockquote']); 57 + editor.addShortcut('meta+q', '', ['FormatBlock', false, 'blockquote']);
58 - editor.addShortcut('ctrl+d', '', ['FormatBlock', false, 'p']); 58 + editor.addShortcut('meta+d', '', ['FormatBlock', false, 'p']);
59 - editor.addShortcut('ctrl+e', '', ['FormatBlock', false, 'pre']); 59 + editor.addShortcut('meta+e', '', ['FormatBlock', false, 'pre']);
60 - editor.addShortcut('ctrl+s', '', ['FormatBlock', false, 'code']); 60 + editor.addShortcut('meta+shift+E', '', ['FormatBlock', false, 'code']);
61 } 61 }
62 62
63 var mceOptions = module.exports = { 63 var mceOptions = module.exports = {
......
...@@ -28,4 +28,7 @@ table { ...@@ -28,4 +28,7 @@ table {
28 padding: 4px 6px; 28 padding: 4px 6px;
29 border: 1px solid #DDD; 29 border: 1px solid #DDD;
30 } 30 }
31 + td p, th p {
32 + margin: 0;
33 + }
31 } 34 }
...\ No newline at end of file ...\ No newline at end of file
......