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

1  2 
lib/editor/atto/styles.css

@@@ -19,7 -15,7 +19,8 @@@ div.editor_atto_toolbar 
      border-top: 1px solid #BBB;
      border-left: 1px solid #BBB;
      border-right: 1px solid #BBB;
 +    width: 100%;
+     padding: 0 0 9px 0;
  }
  
  div.editor_atto_toolbar button {