mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
added cms_typography.css to replace typography.css in the cms, as it confusues with front end typography.css
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@44156 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
709cec5551
commit
943c892548
@ -633,7 +633,7 @@ class ComplexTableField_Popup extends Form {
|
|||||||
Requirements::css('jsparty/tabstrip/tabstrip.css');
|
Requirements::css('jsparty/tabstrip/tabstrip.css');
|
||||||
Requirements::css('sapphire/css/Form.css');
|
Requirements::css('sapphire/css/Form.css');
|
||||||
Requirements::css('sapphire/css/ComplexTableField_popup.css');
|
Requirements::css('sapphire/css/ComplexTableField_popup.css');
|
||||||
Requirements::css('cms/css/typography.css');
|
Requirements::css('cms/css/cms_typography.css');
|
||||||
Requirements::javascript("jsparty/prototype.js");
|
Requirements::javascript("jsparty/prototype.js");
|
||||||
Requirements::javascript("jsparty/behaviour.js");
|
Requirements::javascript("jsparty/behaviour.js");
|
||||||
Requirements::javascript("jsparty/prototype_improvements.js");
|
Requirements::javascript("jsparty/prototype_improvements.js");
|
||||||
|
@ -817,7 +817,7 @@ JS
|
|||||||
|
|
||||||
function printall() {
|
function printall() {
|
||||||
Requirements::clear();
|
Requirements::clear();
|
||||||
Requirements::css('cms/css/typography.css');
|
Requirements::css('cms/css/cms_typography.css');
|
||||||
Requirements::css('cms/css/cms_right.css');
|
Requirements::css('cms/css/cms_right.css');
|
||||||
Requirements::css('sapphire/css/TableListField_print.css');
|
Requirements::css('sapphire/css/TableListField_print.css');
|
||||||
$vd = new ViewableData();
|
$vd = new ViewableData();
|
||||||
|
@ -985,7 +985,7 @@ class Member_ProfileForm extends Form {
|
|||||||
function __construct($controller, $name, $member) {
|
function __construct($controller, $name, $member) {
|
||||||
Requirements::clear();
|
Requirements::clear();
|
||||||
Requirements::css('jsparty/tabstrip/tabstrip.css');
|
Requirements::css('jsparty/tabstrip/tabstrip.css');
|
||||||
Requirements::css('cms/css/typography.css');
|
Requirements::css('cms/css/cms_typography.css');
|
||||||
Requirements::css('cms/css/cms_right.css');
|
Requirements::css('cms/css/cms_right.css');
|
||||||
Requirements::javascript("jsparty/prototype.js");
|
Requirements::javascript("jsparty/prototype.js");
|
||||||
Requirements::javascript("jsparty/behaviour.js");
|
Requirements::javascript("jsparty/behaviour.js");
|
||||||
|
Loading…
Reference in New Issue
Block a user