tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MINOR Don't combine CMS-related CSS files in LeftAndMain, as it breaks relative image paths

This commit is contained in:
Ingo Schommer 2012-01-06 10:46:27 +01:00
parent 66d01d645b
commit 850ea4cd7b
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/code/LeftAndMain.php
View File

@ -283,17 +283,10 @@ class LeftAndMain extends Controller {
Requirements::add_i18n_javascript(SAPPHIRE_DIR . '/javascript/lang');
Requirements::add_i18n_javascript(SAPPHIRE_ADMIN_DIR . '/javascript/lang');
Requirements::combine_files(
'lib.css',
array(
// @todo Load separately so the CSS files can be inlined
THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css',
SAPPHIRE_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css',
THIRDPARTY_DIR . '/jstree/themes/apple/style.css',
SAPPHIRE_DIR . '/css/TreeDropdownField.css'
)
);
Requirements::css(THIRDPARTY_DIR . '/jquery-ui-themes/smoothness/jquery-ui.css');
Requirements::css(SAPPHIRE_ADMIN_DIR .'/thirdparty/chosen/chosen/chosen.css');
Requirements::css(THIRDPARTY_DIR . '/jstree/themes/apple/style.css');
Requirements::css(SAPPHIRE_DIR . '/css/TreeDropdownField.css');
Requirements::css(SAPPHIRE_ADMIN_DIR . '/css/screen.css');
// Browser-specific requirements