mirror of
https://github.com/moodle/moodle.git
synced 2025-08-06 01:16:44 +02:00
Merge branch 'MDL-32879' of git://github.com/lazydaisy/moodle
Conflicts: theme/magazine/config.php
This commit is contained in:
commit
bb0eaec490
12 changed files with 93 additions and 93 deletions
|
@ -38,8 +38,8 @@ $THEME->name = 'arialist';
|
|||
|
||||
|
||||
$THEME->parents = array(
|
||||
'canvas',
|
||||
'base',
|
||||
'canvas',
|
||||
'base',
|
||||
);
|
||||
|
||||
/////////////////////////////////////////////////////
|
||||
|
@ -55,8 +55,8 @@ $THEME->parents = array(
|
|||
|
||||
$THEME->sheets = array(
|
||||
'pagelayout',
|
||||
'core',
|
||||
'settings',
|
||||
'core',
|
||||
'settings',
|
||||
);
|
||||
|
||||
////////////////////////////////////////////////////
|
||||
|
@ -65,12 +65,12 @@ $THEME->sheets = array(
|
|||
////////////////////////////////////////////////////
|
||||
|
||||
$THEME->parents_exclude_sheets = array(
|
||||
'base'=>array(
|
||||
'pagelayout',
|
||||
),
|
||||
'canvas'=>array(
|
||||
'pagelayout',
|
||||
),
|
||||
'base'=>array(
|
||||
'pagelayout',
|
||||
),
|
||||
'canvas'=>array(
|
||||
'pagelayout',
|
||||
),
|
||||
);
|
||||
|
||||
|
||||
|
@ -156,7 +156,7 @@ $THEME->layouts = array(
|
|||
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
|
||||
),
|
||||
'embedded' => array(
|
||||
'theme' => 'canvas',
|
||||
'theme' => 'canvas',
|
||||
'file' => 'embedded.php',
|
||||
'regions' => array(),
|
||||
'options' => array('nofooter'=>true, 'nonavbar'=>true, 'nocustommenu'=>true),
|
||||
|
@ -209,14 +209,14 @@ $THEME->csspostprocess = 'arialist_process_css';
|
|||
// As above but will be included in the page footer.
|
||||
////////////////////////////////////////////////////
|
||||
|
||||
$THEME->larrow = '⟨';
|
||||
$THEME->larrow = '⟨';
|
||||
|
||||
////////////////////////////////////////////////////
|
||||
// Overrides the left arrow image used throughout
|
||||
// Moodle
|
||||
////////////////////////////////////////////////////
|
||||
|
||||
$THEME->rarrow = '⟩';
|
||||
$THEME->rarrow = '⟩';
|
||||
|
||||
////////////////////////////////////////////////////
|
||||
// Overrides the right arrow image used throughout Moodle
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue