From 943c89254829f032cdde5e0d72563a70a56e4475 Mon Sep 17 00:00:00 2001 From: Jeremy Shipman Date: Fri, 2 Nov 2007 02:14:20 +0000 Subject: [PATCH] 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 --- forms/ComplexTableField.php | 2 +- forms/TableListField.php | 2 +- security/Member.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php index cc17297df..d69db4827 100755 --- a/forms/ComplexTableField.php +++ b/forms/ComplexTableField.php @@ -633,7 +633,7 @@ class ComplexTableField_Popup extends Form { Requirements::css('jsparty/tabstrip/tabstrip.css'); Requirements::css('sapphire/css/Form.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/behaviour.js"); Requirements::javascript("jsparty/prototype_improvements.js"); diff --git a/forms/TableListField.php b/forms/TableListField.php index c8bf67a1c..1d0141c4c 100755 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -817,7 +817,7 @@ JS function printall() { Requirements::clear(); - Requirements::css('cms/css/typography.css'); + Requirements::css('cms/css/cms_typography.css'); Requirements::css('cms/css/cms_right.css'); Requirements::css('sapphire/css/TableListField_print.css'); $vd = new ViewableData(); diff --git a/security/Member.php b/security/Member.php index 6ac5683cd..ff395468e 100644 --- a/security/Member.php +++ b/security/Member.php @@ -985,7 +985,7 @@ class Member_ProfileForm extends Form { function __construct($controller, $name, $member) { Requirements::clear(); 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::javascript("jsparty/prototype.js"); Requirements::javascript("jsparty/behaviour.js");