diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css index 6511ee9f515..2acc6590b5d 100644 --- a/lib/editor/atto/styles.css +++ b/lib/editor/atto/styles.css @@ -1,24 +1,29 @@ -div.editor_atto { +.editor_atto_content_wrap { background-color: white; - border: 1px solid #BBB; - width: 100%; +} +.editor_atto_content { + padding: 4px; } +.editor_atto_content_wrap, .editor_atto + textarea { width: 100%; padding: 0; - resize: vertical; - border-radius: 0; border: 1px solid #BBB; + border-top: none; +} + +.editor_atto + textarea { + border-radius: 0; + resize: vertical; + margin-top: -1px; } div.editor_atto_toolbar { display: block; background: #F2F2F2; min-height: 42px; - border-top: 1px solid #BBB; - border-left: 1px solid #BBB; - border-right: 1px solid #BBB; + border: 1px solid #BBB; width: 100%; padding: 0 0 9px 0; } @@ -53,7 +58,7 @@ div.editor_atto_toolbar div.atto_group { background: #FFF; } -.editor_atto img { +.editor_atto_content img { resize: both; overflow: auto; } diff --git a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js index 96ccd495ef5..ccdc137dc2a 100644 --- a/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js +++ b/lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js @@ -15,15 +15,34 @@ YUI.add('moodle-editor_atto-editor', function (Y, NAME) { // You should have received a copy of the GNU General Public License // along with Moodle. If not, see . +/** + * Atto editor. + * + * @package editor_atto + * @copyright 2013 Damyon Wiese + * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later + */ + +/** + * Classes constants. + */ +CSS = { + CONTENT: 'editor_atto_content', + CONTENTWRAPPER: 'editor_atto_content_wrap', + TOOLBAR: 'editor_atto_toolbar', + WRAPPER: 'editor_atto' +}; + /** * Atto editor main class. * Common functions required by editor plugins. * - * @package editor-atto + * @package editor_atto * @copyright 2013 Damyon Wiese * @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later */ M.editor_atto = M.editor_atto || { + /** * List of attached button handlers to prevent duplicates. */ @@ -309,12 +328,22 @@ M.editor_atto = M.editor_atto || { */ init : function(params) { var textarea = Y.one('#' +params.elementid); + var wrapper = Y.Node.create('
'); var atto = Y.Node.create('
'); + 'class="' + CSS.CONTENT + '" />'); + var cssfont = ''; - var toolbar = Y.Node.create('