mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

TinyMce left/right image alignment class added. bbcode-img-left bbcode-img-right

Browse Source
This commit is contained in:
Cameron 2017-12-17 13:12:47 -08:00
parent 1173e3967f
commit d73f39f61d
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/tinymce4/editor.css
View File

@ -4,6 +4,10 @@ div.clearfix { margin-bottom:10px; }
ul.fa-ul { padding-left:5px} ul.fa-ul { padding-left:5px}
li { padding:4px } li { padding:4px }
ul { padding-bottom:8px } ul { padding-bottom:8px }
.bbcode-img-left { margin: 0 10px 5px 0 !important; float:left !important }
.bbcode-img-right { margin: 0 0 5px 10px !important; float:right !important}
.mce-visualblocks li { outline: 1px dashed silver; } .mce-visualblocks li { outline: 1px dashed silver; }
.mce-visualblocks ul.fa-ul { padding-left:30px } .mce-visualblocks ul.fa-ul { padding-left:30px }
.mce-visualblocks .animated, .mce-visualblocks .animated,

6
e107_plugins/tinymce4/wysiwyg.php
View File

@ -549,8 +549,8 @@ class wysiwyg
{title: 'Justify', block: 'div', classes: 'text-justify', icon: 'alignjustify'}, {title: 'Justify', block: 'div', classes: 'text-justify', icon: 'alignjustify'},
{title: 'No Text-Wrap', block: 'div', classes: 'text-nowrap', icon: ''}, {title: 'No Text-Wrap', block: 'div', classes: 'text-nowrap', icon: ''},
{title: 'Clear Float', block: 'div', classes: 'clearfix'}, {title: 'Clear Float', block: 'div', classes: 'clearfix'},
{title: 'Image Left', selector: 'img', classes: 'pull-left', styles: {'margin': '0 10px 5px 0' }, icon: 'alignleft'}, {title: 'Image Left', selector: 'img', classes: 'bbcode-img-left', icon: 'alignleft'},
{title: 'Image Right', selector: 'img', classes: 'pull-right', styles: { 'margin': '0 0 5px 10px'}, icon: 'alignright'} {title: 'Image Right', selector: 'img', classes: 'bbcode-img-right', icon: 'alignright'}
]}, ]},
@ -854,7 +854,7 @@ class wysiwyg
0 => $pathBS . '/dist/css/bootstrap.min.css', 0 => $pathBS . '/dist/css/bootstrap.min.css',
1 => $pathFA . '/css/font-awesome.min.css', 1 => $pathFA . '/css/font-awesome.min.css',
2 => e_PLUGIN_ABS . 'tinymce4/editor.css', 2 => e_PLUGIN_ABS . 'tinymce4/editor.css',
3 => $pathAn . '/animate.min.css', 3 => $pathAn . 'animate.min.css',
); );

4
e107_web/css/e107.css
View File

@ -123,6 +123,10 @@ div.bbarea.large, .tbox.large, .helpbox.large { width: 95% }
div.bbarea.medium, .tbox.medium, .helpbox.medium { width: 60% !important; } div.bbarea.medium, .tbox.medium, .helpbox.medium { width: 60% !important; }
div.bbarea.small, .tbox.small, .helpbox.small { width: 250px !important; } div.bbarea.small, .tbox.small, .helpbox.small { width: 250px !important; }
img.bbcode-img { max-width:100%} img.bbcode-img { max-width:100%}
img.bbcode-img-left { float:left !important; margin: 0 10px 5px 0; }
img.bbcode-img-right { float:right !important; margin: 0 0 5px 10px; }
.bbcode-panel { width: 100% } .bbcode-panel { width: 100% }
.input-block-level { width: 100% !important } .input-block-level { width: 100% !important }