moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-51881' of https://github.com/rajeshtaneja/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-01-05 14:08:18 +08:00
commit 887785db42
6 changed files with 206 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/behat/lib.php
View file

@ -180,15 +180,6 @@ function behat_clean_init_config() {
unset($CFG->{$key});
}
}
// Here we are forcing the navbar to be absolutely positioned in Chrome, Safari and IE in order to
// avoid a driver bug whereby when the browser scrolls something into view it doesn't account
// for fixed positioned elements that end up obscuring the item thus leading to errors that
// could be avoided by scrolling an additional amount.
// This should be removed as soon as the affected drivers have been fixed.
$CFG->forced_plugin_settings['theme_clean'] = array(
'customcss' => 'body.safari .navbar-fixed-top, body.ie .navbar-fixed-top {position: absolute;}'
);
}
/**

5
lib/pagelib.php
View file

@ -1747,6 +1747,11 @@ class moodle_page {
if ($this->_devicetypeinuse != 'default') {
$this->add_body_class($this->_devicetypeinuse . 'theme');
}
// Add class for behat site to apply behat related fixes.
if (defined('BEHAT_SITE_RUNNING')) {
$this->add_body_class('behat-site');
}
}
/**