github-mirror/BookStack
github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-04-02 05:45:13 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Added margins to floated images and updated editor controls. Fixes #18.

Browse Source
This commit is contained in:
Dan Brown 2015-10-14 22:12:46 +01:00
parent 965851d112
commit 5795e12052
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ module.exports = {
automatic_uploads: false, automatic_uploads: false,
valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]", valid_children: "-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]",
plugins: "image table textcolor paste link imagetools fullscreen code hr", plugins: "image table textcolor paste link imagetools fullscreen code hr",
toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link hr | code fullscreen", toolbar: "undo redo | styleselect | bold italic underline strikethrough superscript subscript | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table image link hr | removeformat code fullscreen",
content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}", content_style: "body {padding-left: 15px !important; padding-right: 15px !important; margin:0!important; margin-left:auto!important;margin-right:auto!important;}",
style_formats: [ style_formats: [
{title: "Header 1", format: "h1"}, {title: "Header 1", format: "h1"},
@ -27,6 +27,11 @@ module.exports = {
{title: "Code Block", icon: "code", format: "pre"}, {title: "Code Block", icon: "code", format: "pre"},
{title: "Inline Code", icon: "code", inline: "code"} {title: "Inline Code", icon: "code", inline: "code"}
], ],
formats : {
alignleft : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-left'},
aligncenter : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-center'},
alignright : {selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img', classes : 'align-right'},
},
file_browser_callback: function(field_name, url, type, win) { file_browser_callback: function(field_name, url, type, win) {
ImageManager.show(function(image) { ImageManager.show(function(image) {
win.document.getElementById(field_name).value = image.url; win.document.getElementById(field_name).value = image.url;

16
resources/assets/sass/_pages.scss
View File

@ -17,10 +17,26 @@
.page-content { .page-content {
max-width: 840px; max-width: 840px;
.align-left {
float: left !important;
text-align: left;
margin: $-xs $-s $-xs 0;
}
.align-right {
float: right !important;
text-align: right;
margin: $-xs 0 $-xs $-s;
}
.align-center {
text-align: center;
}
img { img {
max-width: 100%; max-width: 100%;
height:auto; height:auto;
} }
h1, h2, h3, h4, h5, h6 {
clear: both;
}
} }
// Page content pointers // Page content pointers