Toggle navigation
Toggle navigation
This project
Loading...
Sign in
Зуев Егор
/
wiki.dev
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
Authored by
Dan Brown
2015-10-14 22:12:46 +0100
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Commit
5795e12052e0c111f3c71aa62e5b46c25901948a
5795e120
1 parent
965851d1
Added margins to floated images and updated editor controls. Fixes #18.
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
1 deletions
resources/assets/js/pages/page-form.js
resources/assets/sass/_pages.scss
resources/assets/js/pages/page-form.js
View file @
5795e12
...
...
@@ -15,7 +15,7 @@ module.exports = {
automatic_uploads
:
false
,
valid_children
:
"-div[p|pre|h1|h2|h3|h4|h5|h6|blockquote]"
,
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;}"
,
style_formats
:
[
{
title
:
"Header 1"
,
format
:
"h1"
},
...
...
@@ -27,6 +27,11 @@ module.exports = {
{
title
:
"Code Block"
,
icon
:
"code"
,
format
:
"pre"
},
{
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
)
{
ImageManager
.
show
(
function
(
image
)
{
win
.
document
.
getElementById
(
field_name
).
value
=
image
.
url
;
...
...
resources/assets/sass/_pages.scss
View file @
5795e12
...
...
@@ -17,10 +17,26 @@
.page-content
{
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
{
max-width
:
100%
;
height
:auto
;
}
h1
,
h2
,
h3
,
h4
,
h5
,
h6
{
clear
:
both
;
}
}
// Page content pointers
...
...
Please
register
or
sign in
to post a comment