From 385275344c235bd78f799bd30407bd7b524b3c1f Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 19 Jul 2015 23:12:49 -0700 Subject: [PATCH] Bootstrap Label fix. TinyMce upgraded to 4.1 --- e107_plugins/tinymce4/e_footer.php | 4 ++-- e107_plugins/tinymce4/wysiwyg.php | 3 ++- e107_themes/bootstrap3/css/bootstrap-dark.min.css | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/e107_plugins/tinymce4/e_footer.php b/e107_plugins/tinymce4/e_footer.php index 8dfa327b7..5ff1bfb0d 100644 --- a/e107_plugins/tinymce4/e_footer.php +++ b/e107_plugins/tinymce4/e_footer.php @@ -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','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('inline', " // tinymce.init({selector:'.e-wysiwyg'}); @@ -36,7 +36,7 @@ if((e107::wysiwyg() === true && check_class($pref['post_html'])) || strpos(e_SEL if(ADMIN) { $insert = "$('#'+id).after('
"; - $insert .= "Switch to bbcode<\/a>"; + $insert .= "Switch to bbcode<\/a>"; if(e_PAGE == 'mailout.php') { diff --git a/e107_plugins/tinymce4/wysiwyg.php b/e107_plugins/tinymce4/wysiwyg.php index 7d8c19eb3..cd8e5ad78 100644 --- a/e107_plugins/tinymce4/wysiwyg.php +++ b/e107_plugins/tinymce4/wysiwyg.php @@ -550,7 +550,8 @@ class wysiwyg $ret['extended_smileys'] = json_encode($emotes); } - + // $ret['skin'] = 'e107admin'; + // $ret['skin_url'] = SITEURLBASE.e_PLUGIN_ABS.'tinymce4/skins/e107admin'; diff --git a/e107_themes/bootstrap3/css/bootstrap-dark.min.css b/e107_themes/bootstrap3/css/bootstrap-dark.min.css index 4a6a81985..dc0ba611e 100644 --- a/e107_themes/bootstrap3/css/bootstrap-dark.min.css +++ b/e107_themes/bootstrap3/css/bootstrap-dark.min.css @@ -339,7 +339,7 @@ hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #0a0a0a} p{margin:0 0 10px} .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} -dt,kbd kbd,label{font-weight:700} +dt,kbd kbd{font-weight:700} @media (min-width:768px){.lead{font-size:21px} } .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-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} +label{font-weight:400} 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} .has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406}