diff --git a/engine/lib/external/jquery/markitup/skins/simple/style.css b/engine/lib/external/jquery/markitup/skins/simple/style.css index d1fa3f49..07027dcb 100644 --- a/engine/lib/external/jquery/markitup/skins/simple/style.css +++ b/engine/lib/external/jquery/markitup/skins/simple/style.css @@ -4,15 +4,18 @@ // ------------------------------------------------------------------*/ .markItUp a: link, .markItUp a: visited { color: #000; text-decoration: none; } -.markItUp { width: 600px; margin-bottom: 5px; } +.markItUp { margin-bottom: 5px; } .markItUpContainer { font: 11px Verdana, Arial, Helvetica, sans-serif; } .markItUpEditor { font: 12px "Courier New", Courier, monospace; padding: 5px; - width: 587px; height: 200px; line-height: 18px; overflow: auto; + width: 100%; + -moz-box-sizing: border-box; + box-sizing: border-box; + border: 1px solid #C0CAD5; } .markItUpPreviewFrame { overflow: auto; @@ -35,7 +38,6 @@ /***************************************************************************************/ /* first row of buttons */ .markItUpHeader { - width: 587px; background: #eee; padding: 5px; border-top: 1px solid #c0cad5; diff --git a/engine/lib/internal/template/js/settings.js b/engine/lib/internal/template/js/settings.js index 6f5e78d4..42e5dc47 100644 --- a/engine/lib/internal/template/js/settings.js +++ b/engine/lib/internal/template/js/settings.js @@ -27,7 +27,6 @@ ls.settings = (function ($) { {name: ls.lang.get('panel_list_li'), className:'editor-li', openWith:'
'+m.selectionOuter+''; else if (m.selection) return '
'+m.selection+''; else return '' } }, {name: ls.lang.get('panel_code'), className:'editor-code', openWith:'
', closeWith:'
' },
{name: ls.lang.get('panel_image'), className:'editor-picture', key:'P', beforeInsert: function(h) { jQuery('#window_upload_img').jqmShow(); } },
- {name: ls.lang.get('panel_image'), className:'editor-image', replaceWith:'-
+-
+-
- --
+-
+@@ -88,14 +88,12 @@ - + -
+ {hook run='add_topic_topic_end'} diff --git a/templates/skin/developer-jquery/comment_tree.tpl b/templates/skin/developer-jquery/comment_tree.tpl index 964049d2..cc32bd32 100644 --- a/templates/skin/developer-jquery/comment_tree.tpl +++ b/templates/skin/developer-jquery/comment_tree.tpl @@ -79,7 +79,7 @@