mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-20 07:30:01 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-47935-master' of git://github.com/gurgus/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2015-01-12 12:54:23 +00:00
commit 3eda28e937
5 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/editor/atto/styles.css
View File

@ -181,35 +181,45 @@ div.editor_atto_content:hover .atto_control {
padding-top: 5px;
padding-bottom: 5px;
}
.editor_atto_notification {
.editor_atto_wrap {
position: relative;
bottom: 0px;
}
.editor_atto_notification{
position: absolute;
bottom: -1.5em;
height: 1.5em;
margin-top: -2.5em;
margin-left: 1px;
margin-right: 1px;
margin-bottom: 1em;
margin-top: 1px;
cursor: pointer;
}
.editor_atto_notification .atto_info {
.editor_atto_notification .atto_info,
.editor_atto_notification .atto_warning {
display: inline-block;
background-color: #F2F2F2;
padding: 0.5em;
padding-left: 1em;
padding-right: 1em;
border-top-right-radius: 1em;
border-bottom-left-radius: 1em;
border-bottom-right-radius: 1em;
}
.editor_atto_notification .atto_info {
background-color: #F2F2F2;
}
.editor_atto_notification .atto_warning {
display: inline-block;
background-color: #FFD700;
padding: 0.5em;
padding-left: 1em;
padding-right: 1em;
border-top-right-radius: 1em;
}
.editor_atto_toolbar,
.editor_atto_content_wrap,
.editor_atto + textarea {
box-sizing: border-box;
}
.dir-rtl .editor_atto_notification .atto_info,
.dir-rtl .editor_atto_notification .atto_warning {
border-top-right-radius: 0;
border-top-left-radius: 1em;
border-bottom-right-radius: 1em;
border-bottom-left-radius: 1em;
}
.dir-ltr .editor_atto_notification {
right: 0;
}
.dir-rtl .editor_atto_notification {
left: 0;
}

3
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-debug.js vendored
View File

@ -217,7 +217,8 @@ Y.extend(Editor, Y.Base, {
}
// Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea);
this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap');
// Hide the old textarea.
this.textarea.hide();

6
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js vendored
View File

File diff suppressed because one or more lines are too long

3
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor.js vendored
View File

@ -215,7 +215,8 @@ Y.extend(Editor, Y.Base, {
}
// Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea);
this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap');
// Hide the old textarea.
this.textarea.hide();

3
lib/editor/atto/yui/src/editor/js/editor.js vendored
View File

@ -215,7 +215,8 @@ Y.extend(Editor, Y.Base, {
}
// Add the toolbar and editable zone to the page.
this.textarea.get('parentNode').insert(this._wrapper, this.textarea);
this.textarea.get('parentNode').insert(this._wrapper, this.textarea).
setAttribute('class', 'editor_atto_wrap');
// Hide the old textarea.
this.textarea.hide();