Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle
authorMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)
committerMarina Glancy <marina@moodle.com>
Wed, 25 Sep 2013 02:53:09 +0000 (12:53 +1000)
Conflicts:
lib/editor/atto/styles.css

lib/editor/atto/styles.css

index 6511ee9..c75c3fb 100644 (file)
@@ -2,6 +2,7 @@ div.editor_atto {
     background-color: white;
     border: 1px solid #BBB;
     width: 100%;
+    padding: 4px;
 }
 
 .editor_atto + textarea {