Merge branch 'MDL-41912-master' of git://github.com/damyon/moodle

Conflicts: lib/editor/atto/styles.css
reskit · Sep 25, 2013 · 093a6fe · 093a6fe
2 parents 88a4cb4 + 2bc4212
commit 093a6fe
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/lib/editor/atto/styles.css b/lib/editor/atto/styles.css
@@ -2,6 +2,7 @@ div.editor_atto {
     background-color: white;
     border: 1px solid #BBB;
     width: 100%;
+    padding: 4px;
 }
 
 .editor_atto + textarea {