Merge branch 'MDL-41236-master' of git://github.com/phalacee/moodle

diff --cc lib/editor/atto/styles.css
index ae6640a,44cf7a6..e794e85
--- 1/lib/editor/atto/styles.css
--- 2/lib/editor/atto/styles.css
+++ b/lib/editor/atto/styles.css
@@@ -1,15 -1,15 +1,20 @@@
  div.editor_atto {
      background-color: white;
-     border: 1px solid #444;
+     border: 1px solid #BBB;
  }
  
 +.editor_atto + textarea {
 +    width: 100%;
 +    padding: 0;
 +}
 +
  div.editor_atto_toolbar {
      display: block;
+     background: #F2F2F2;
+     min-height: 36px;
+     border-top: 1px solid #BBB;
+     border-left: 1px solid #BBB;
+     border-right: 1px solid #BBB;
  }
  
  div.editor_atto_toolbar button {