From 4543168efba284826c2ea06177321a33842df53b Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sun, 29 Jul 2012 21:31:47 +0100 Subject: [PATCH] MDL-34526 theme_canvas: incorporating MDL-34528 - Remove redundent exclude stylesheet configurations from CANVAS theme --- theme/canvas/config.php | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/theme/canvas/config.php b/theme/canvas/config.php index d5d7d470d54..70d1790a21d 100644 --- a/theme/canvas/config.php +++ b/theme/canvas/config.php @@ -40,9 +40,7 @@ $THEME->name = 'canvas'; // 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 @@ $THEME->sheets = array( // 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 @@ -261,4 +254,4 @@ $THEME->editor_sheets = array('editor'); //////////////////////////////////////////////////// // Sets a custom render factory to use with the // theme, used when working with custom renderers. -//////////////////////////////////////////////////// \ No newline at end of file +////////////////////////////////////////////////////