Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-10-01 01:36:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Also changed shortcuts to be better compatible with OSX by using the
command key.
This commit is contained in:
Dan Brown 2016-09-06 19:50:47 +01:00
parent f06770d91d
commit d94fc5b694
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/assets/js/pages/page-form.js
View File

@ -54,10 +54,10 @@ function registerEditorShortcuts(editor) {
} }
// Other block shortcuts // Other block shortcuts
editor.addShortcut('ctrl+q', '', ['FormatBlock', false, 'blockquote']); editor.addShortcut('meta+q', '', ['FormatBlock', false, 'blockquote']);
editor.addShortcut('ctrl+d', '', ['FormatBlock', false, 'p']); editor.addShortcut('meta+d', '', ['FormatBlock', false, 'p']);
editor.addShortcut('ctrl+e', '', ['FormatBlock', false, 'pre']); editor.addShortcut('meta+e', '', ['FormatBlock', false, 'pre']);
editor.addShortcut('ctrl+s', '', ['FormatBlock', false, 'code']); editor.addShortcut('meta+shift+E', '', ['FormatBlock', false, 'code']);
} }
var mceOptions = module.exports = { var mceOptions = module.exports = {

3
resources/assets/sass/_html.scss
View File

@ -28,4 +28,7 @@ table {
padding: 4px 6px; padding: 4px 6px;
border: 1px solid #DDD; border: 1px solid #DDD;
} }
td p, th p {
margin: 0;
}
} }