Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
@@ -130,7 +130,7 @@ export default {
|
|||||||
valid_styles: {
|
valid_styles: {
|
||||||
'*': 'display, margin, float, margin-left, margin-right, margin-top, margin-bottom, padding-left, padding-right, padding-top, padding-bottom, text-decoration, border,font-size,color,background,background-color,line-height,text-align,list-style-type, border-radius'
|
'*': 'display, margin, float, margin-left, margin-right, margin-top, margin-bottom, padding-left, padding-right, padding-top, padding-bottom, text-decoration, border,font-size,color,background,background-color,line-height,text-align,list-style-type, border-radius'
|
||||||
},
|
},
|
||||||
plugins: ['autoresize', 'link', 'image', 'media', 'lists'],
|
plugins: ['autoresize', 'link', 'image', 'media', 'lists', 'nonbreaking'],
|
||||||
removed_menuitems: 'newdocument',
|
removed_menuitems: 'newdocument',
|
||||||
toolbarxx:
|
toolbarxx:
|
||||||
'undo redo | bold italic | bullist numlist outdent indent | alignleft aligncenter alignright alignjustify | link image forecolor backcolor | ai_button',
|
'undo redo | bold italic | bullist numlist outdent indent | alignleft aligncenter alignright alignjustify | link image forecolor backcolor | ai_button',
|
||||||
@@ -152,7 +152,7 @@ export default {
|
|||||||
insert: {
|
insert: {
|
||||||
title: 'Insert',
|
title: 'Insert',
|
||||||
items:
|
items:
|
||||||
'image link media | hr'
|
'image link media | hr nonbreaking'
|
||||||
},
|
},
|
||||||
format: {
|
format: {
|
||||||
title: 'Format',
|
title: 'Format',
|
||||||
|
|||||||
Reference in New Issue
Block a user