mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-21 16:32:18 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-40204_master' of git://github.com/gjb2048/moodle

Browse Source 
Conflicts:
	theme/bootstrapbase/style/moodle.css
This commit is contained in:
Sam Hemelryk 2013-06-25 11:35:57 +12:00
commit 49eef7d82d
4 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
theme/bootstrapbase/layout/columns3.php
View File

@ -14,6 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.
if (right_to_left()) {
$regionbsid = 'region-bs-main-and-post';
} else {
$regionbsid = 'region-bs-main-and-pre';
}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes(); ?>>
<head>
@ -61,7 +67,7 @@ echo $OUTPUT->doctype() ?>
</header>
<div id="page-content" class="row-fluid">
<div id="region-bs-main-and-pre" class="span9">
<div id="<?php echo $regionbsid ?>" class="span9">
<div class="row-fluid">
<section id="region-main" class="span8 pull-right">
<?php

6
theme/bootstrapbase/less/moodle/core.less
View File

@ -36,6 +36,12 @@
/** decrease the span size by 1 **/
.fluid-span(3);
}
.empty-region-side-post #region-bs-main-and-post.span9 #region-main.span8 {
/** RTL with no post area. **/
width:100%;
}
/** Page layout CSS ends **/
.dir-ltr,

2
theme/bootstrapbase/style/moodle.css
View File

File diff suppressed because one or more lines are too long

8
theme/clean/layout/columns3.php
View File

@ -31,6 +31,12 @@
// Get the HTML for the settings bits.
$html = theme_clean_get_html_for_settings($OUTPUT, $PAGE);
if (right_to_left()) {
$regionbsid = 'region-bs-main-and-post';
} else {
$regionbsid = 'region-bs-main-and-pre';
}
echo $OUTPUT->doctype() ?>
<html <?php echo $OUTPUT->htmlattributes(); ?>>
<head>
@ -78,7 +84,7 @@ echo $OUTPUT->doctype() ?>
</header>
<div id="page-content" class="row-fluid">
<div id="region-bs-main-and-pre" class="span9">
<div id="<?php echo $regionbsid ?>" class="span9">
<div class="row-fluid">
<section id="region-main" class="span8 pull-right">
<?php