Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 22:27:30 +0000 (00:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Apr 2014 22:27:30 +0000 (00:27 +0200)
Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js

1  2 
lib/editor/atto/plugins/image/lib.php
lib/editor/atto/plugins/image/styles.css
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-debug.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button.js
lib/editor/atto/plugins/image/yui/src/button/js/button.js

Simple merge
@@@ -1,9 -1,18 +1,23 @@@
  .atto_image_preview {
      max-width: 150px;
      max-height: 150px;
 +    margin-bottom: 1em;
 +}
 +
 +.editor_atto_content img {
 +    cursor: pointer;
  }
+ .atto_image_size {
+     display: inline-block;
+ }
+ .atto_image_size input[type=checkbox] {
+     margin-left: 1em;
+     margin-right: 1em;
+ }
+ .atto_image_size input[type=text] {
+     width: 3em;
+ }
+ .atto_image_size label {
+     display: inline-block;
+ }