From: Dan Brown <redacted>
Date: Tue, 6 Sep 2016 18:50:47 +0000 (+0100)
Subject: Fixed table cell p tag spacing and de-duped editor shortcuts
X-Git-Tag: v0.12.1~1^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/d94fc5b6945ebe827cf71b36d01894a97bd902dd

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.
---

diff --git a/resources/assets/js/pages/page-form.js b/resources/assets/js/pages/page-form.js
index 101aa8a38..66161a248 100644
--- a/resources/assets/js/pages/page-form.js
+++ b/resources/assets/js/pages/page-form.js
@@ -54,10 +54,10 @@ function registerEditorShortcuts(editor) {
     }
 
     // Other block shortcuts
-    editor.addShortcut('ctrl+q', '', ['FormatBlock', false, 'blockquote']);
-    editor.addShortcut('ctrl+d', '', ['FormatBlock', false, 'p']);
-    editor.addShortcut('ctrl+e', '', ['FormatBlock', false, 'pre']);
-    editor.addShortcut('ctrl+s', '', ['FormatBlock', false, 'code']);
+    editor.addShortcut('meta+q', '', ['FormatBlock', false, 'blockquote']);
+    editor.addShortcut('meta+d', '', ['FormatBlock', false, 'p']);
+    editor.addShortcut('meta+e', '', ['FormatBlock', false, 'pre']);
+    editor.addShortcut('meta+shift+E', '', ['FormatBlock', false, 'code']);
 }
 
 var mceOptions = module.exports = {
diff --git a/resources/assets/sass/_html.scss b/resources/assets/sass/_html.scss
index 2b91f9dc6..82eb9c2b9 100644
--- a/resources/assets/sass/_html.scss
+++ b/resources/assets/sass/_html.scss
@@ -28,4 +28,7 @@ table {
 	padding: 4px 6px;
 	border: 1px solid #DDD;
   }
+  td p, th p {
+    margin: 0;
+  }
 }
\ No newline at end of file