mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-06 06:38:00 +02:00
Code Issues Releases Wiki Activity

Bootstrap Label fix. TinyMce upgraded to 4.1

Browse Source
This commit is contained in:
Cameron
2015-07-19 23:12:49 -07:00
parent 2ec557794d
commit 385275344c
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_plugins/tinymce4/e_footer.php
View File

@@ -19,7 +19,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
//e107::js('tinymce','tiny_mce.js','jquery'); //e107::js('tinymce','tiny_mce.js','jquery');
//e107::js('tinymce','wysiwyg.php','jquery',5); //e107::js('tinymce','wysiwyg.php','jquery',5);
e107::js('footer', "http://tinymce.cachefly.net/4.1/tinymce.min.js"); e107::js('footer', "http://tinymce.cachefly.net/4.2/tinymce.min.js");
e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5); e107::js('footer',e_PLUGIN.'tinymce4/wysiwyg.php','jquery',5);
// e107::js('inline', " // e107::js('inline', "
// tinymce.init({selector:'.e-wysiwyg'}); // tinymce.init({selector:'.e-wysiwyg'});
@@ -36,7 +36,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL
if(ADMIN) if(ADMIN)
{ {
$insert = "$('#'+id).after('<div>"; $insert = "$('#'+id).after('<div>";
$insert .= "<a href=\"#\" id=\"' + id + '\" class=\"e-wysiwyg-toggle btn btn-inverse btn-mini\">Switch to bbcode<\/a>"; $insert .= "<a href=\"#\" id=\"' + id + '\" class=\"e-wysiwyg-toggle btn btn-xs btn-default btn-inverse btn-mini\">Switch to bbcode<\/a>";
if(e_PAGE == 'mailout.php') if(e_PAGE == 'mailout.php')
{ {

3
e107_plugins/tinymce4/wysiwyg.php
View File

@@ -550,7 +550,8 @@ class wysiwyg
$ret['extended_smileys'] = json_encode($emotes); $ret['extended_smileys'] = json_encode($emotes);
} }
// $ret['skin'] = 'e107admin';
// $ret['skin_url'] = SITEURLBASE.e_PLUGIN_ABS.'tinymce4/skins/e107admin';

3
e107_themes/bootstrap3/css/bootstrap-dark.min.css vendored
View File

@@ -339,7 +339,7 @@ hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #0a0a0a}
p{margin:0 0 10px} p{margin:0 0 10px}
.lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4} .lead{margin-bottom:20px;font-size:16px;font-weight:300;line-height:1.4}
address,blockquote .small,blockquote footer,blockquote small,dd,dt,pre{line-height:1.42857143} address,blockquote .small,blockquote footer,blockquote small,dd,dt,pre{line-height:1.42857143}
dt,kbd kbd,label{font-weight:700} dt,kbd kbd{font-weight:700}
@media (min-width:768px){.lead{font-size:21px} @media (min-width:768px){.lead{font-size:21px}
} }
.small,small{font-size:85%} .small,small{font-size:85%}
@@ -1453,6 +1453,7 @@ h1,h2,h3,h4,h5,h6{text-shadow:-1px -1px 0 rgba(0,0,0,.3)}
.table .danger,.table .info,.table .success,.table .warning{color:#fff} .table .danger,.table .info,.table .success,.table .warning{color:#fff}
.table-bordered tbody tr.danger td,.table-bordered tbody tr.danger:hover td,.table-bordered tbody tr.success td,.table-bordered tbody tr.success:hover td,.table-bordered tbody tr.warning td,.table-bordered tbody tr.warning:hover td{border-color:#0a0a0a} .table-bordered tbody tr.danger td,.table-bordered tbody tr.danger:hover td,.table-bordered tbody tr.success td,.table-bordered tbody tr.success:hover td,.table-bordered tbody tr.warning td,.table-bordered tbody tr.warning:hover td{border-color:#0a0a0a}
.table-responsive>.table{background-color:#373737} .table-responsive>.table{background-color:#373737}
label{font-weight:400}
input,select,textarea{color:#eee;background-color:#222} input,select,textarea{color:#eee;background-color:#222}
input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid #171717;border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:14px} input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid #171717;border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:14px}
.has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406} .has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406}