mirror of
https://github.com/silverstripe/silverstripe-cms
synced 2024-10-22 08:05:56 +02:00
Use themed typography in CMS
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@39036 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
abb9a61d0d
commit
d53ea72c34
@ -64,7 +64,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
|||||||
// For Gallery
|
// For Gallery
|
||||||
Requirements::javascript('gallery/javascript/GalleryPage_CMS.js');
|
Requirements::javascript('gallery/javascript/GalleryPage_CMS.js');
|
||||||
|
|
||||||
Requirements::css(project() . "/css/typography.css");
|
Requirements::themedCSS('typography');
|
||||||
|
|
||||||
// HACK ALERT:
|
// HACK ALERT:
|
||||||
// We need a better way of including all of the CSS that *might* be used by this application.
|
// We need a better way of including all of the CSS that *might* be used by this application.
|
||||||
@ -76,7 +76,7 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr
|
|||||||
// We don't want this showing up in every ajax-response, it should always be present in a CMS-environment
|
// We don't want this showing up in every ajax-response, it should always be present in a CMS-environment
|
||||||
if(!Director::is_ajax()) {
|
if(!Director::is_ajax()) {
|
||||||
Requirements::javascriptTemplate("cms/javascript/tinymce.template.js", array(
|
Requirements::javascriptTemplate("cms/javascript/tinymce.template.js", array(
|
||||||
"ContentCSS" => project() . "/css/editor.css",
|
"ContentCSS" => (SSViewer::current_theme() ? "themes/" . SSViewer::current_theme() : project()) . "/css/editor.css",
|
||||||
"BaseURL" => Director::absoluteBaseURL(),
|
"BaseURL" => Director::absoluteBaseURL(),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user