Merge branch 'MDL-50990_master' of git://github.com/lazydaisy/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 18 Aug 2015 01:47:38 +0000 (09:47 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 18 Aug 2015 01:47:38 +0000 (09:47 +0800)
Conflicts:
theme/base/style/blocks.css

1  2 
theme/base/style/blocks.css

  }
  
  /** Overide for RTL layout **/
- .dir-rtl .block .header,
- .dir-rtl .block h2.header {text-align:right;}
- .dir-rtl .block .header .block_action { float: left; margin-left: 4px; margin-left: 0;}
 +.dir-rtl .block .header h2 {
 +    padding: .2em .2em 0 0;
 +}
+ .dir-rtl .block .header .block_action { float: left;}
  
  .dir-rtl.editing .block .header .commands {
      text-align: left;