Permalink
Browse files

MDL-42852 lib: Blocks disappear in Clean in RTL.

Conflicts:
	theme/bootstrapbase/style/moodle.css
  • Loading branch information...
1 parent 7628ac7 commit 600ad57d359bd26e11ba6f0810007044af3785de @gjb2048 gjb2048 committed with Sam Hemelryk Nov 17, 2013
Showing with 15 additions and 10 deletions.
  1. +2 −3 lib/outputrenderers.php
  2. +12 −6 theme/bootstrapbase/less/moodle/core.less
  3. +1 −1 theme/bootstrapbase/style/moodle.css
View
@@ -1392,7 +1392,6 @@ public function list_block_contents($icons, $items) {
* @return string the HTML to be output.
*/
public function blocks_for_region($region) {
- $region = $this->page->apply_theme_region_manipulations($region);
$blockcontents = $this->page->blocks->get_content_for_region($region, $this);
$blocks = $this->page->blocks->get_blocks_for_region($region);
$lastblock = null;
@@ -3225,8 +3224,8 @@ public function blocks($region, $classes = array(), $tag = 'aside') {
'data-blockregion' => $displayregion,
'data-droptarget' => '1'
);
- if ($this->page->blocks->region_has_content($region, $this)) {
- $content = $this->blocks_for_region($region);
+ if ($this->page->blocks->region_has_content($displayregion, $this)) {
+ $content = $this->blocks_for_region($displayregion);
} else {
$content = '';
}
@@ -14,11 +14,17 @@
display:none;
}
-.empty-region-side-post #region-bs-main-and-pre.span9 {
- width:100%;
+.empty-region-side-post #region-bs-main-and-pre.span9,
+.empty-region-side-pre #region-bs-main-and-post.span9,
+.empty-region-side-post #region-bs-main-and-post.span9 #region-main.span8 {
+ /** LTR with no post area.
+ RTL with no pre area.
+ RTL with no post area. **/
+ width: 100%;
}
-.empty-region-side-pre #region-main {
+.empty-region-side-pre #region-bs-main-and-pre.span9 #region-main {
+ /** LTR with no pre area. **/
float:none;
width:100%;
}
@@ -32,9 +38,9 @@
.fluid-span(3);
}
-.empty-region-side-post #region-bs-main-and-post.span9 #region-main.span8 {
- /** RTL with no post area. **/
- width:100%;
+.empty-region-side-pre #region-bs-main-and-post.span9 #region-main.span8 {
+ /** RTL with no pre area. **/
+ float: right;
}
/** Page layout CSS ends **/

Large diffs are not rendered by default.

Oops, something went wrong.

0 comments on commit 600ad57

Please sign in to comment.