Permalink
Browse files

Merge branch 'MDL-34528_M23' of git://github.com/lazydaisy/moodle int…

…o MOODLE_23_STABLE
  • Loading branch information...
2 parents 3c3cf6d + f785edd commit acb533009f7a964d368026a96230f5eb2265e9ae Sam Hemelryk committed Jul 31, 2012
Showing with 3 additions and 15 deletions.
  1. +3 −15 theme/canvas/config.php
View
@@ -40,9 +40,7 @@
// the directory in which this file resides.
////////////////////////////////////////////////////
-$THEME->parents = array(
- 'base',
-);
+$THEME->parents = array('base');
/////////////////////////////////////////////////////
// Which existing theme(s) in the /theme/ directory
@@ -73,12 +71,7 @@
// this theme's /styles/ directory.
////////////////////////////////////////////////////
-$THEME->parents_exclude_sheets = array(
- 'base'=>array(
- 'navigation',
- 'browser',
- ),
-);
+$THEME->parents_exclude_sheets = array();
////////////////////////////////////////////////////
// An array of stylesheets not to inherit from the
@@ -194,16 +187,13 @@
// switched on.
/////////////////////////////////////////////////////
-
-
// $THEME->enable_dock = false;
////////////////////////////////////////////////////
// Do you want to use the new navigation dock?
////////////////////////////////////////////////////
-
-// $THEME->editor_sheets
+$THEME->editor_sheets = array('editor');
////////////////////////////////////////////////////
// An array of stylesheets to include within the
@@ -265,5 +255,3 @@
// Sets a custom render factory to use with the
// theme, used when working with custom renderers.
////////////////////////////////////////////////////
-
-$THEME->editor_sheets = array('editor');

0 comments on commit acb5330

Please sign in to comment.