From 64749dfd3df69cc7518cd745cdb5c8936c962ed1 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/cms/trunk@44156 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/AssetAdmin.php | 2 +- css/cms_typography.css | 35 +++++++++++++++++++++++++++++++++++ templates/LeftAndMain.ss | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 css/cms_typography.css diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index 952f83a3..aa539c4d 100755 --- a/code/AssetAdmin.php +++ b/code/AssetAdmin.php @@ -93,7 +93,7 @@ HTML; Requirements::javascript("cms/javascript/LeftAndMain.js"); Requirements::javascript("jsparty/multifile/multifile.js"); Requirements::css("jsparty/multifile/multifile.css"); - Requirements::css("cms/css/typography.css"); + Requirements::css("cms/css/cms_typography.css"); Requirements::css("cms/css/layout.css"); Requirements::css("cms/css/cms_left.css"); Requirements::css("cms/css/cms_right.css"); diff --git a/css/cms_typography.css b/css/cms_typography.css new file mode 100644 index 00000000..64068f2c --- /dev/null +++ b/css/cms_typography.css @@ -0,0 +1,35 @@ +* { + font-family: Arial, Helvetica, sans-serif; +} + +p, ul, td, th { + font-size: 12px; +} + p { + color: #666; + } + +h1, h2 { + color: #222; +} + h1 { + font-size: 20px; + } + h2{ + font-family:"Helvetica Neue",Helvetica,Arial,Sans-serif; + font-size:12px; + font-weight:bold; + } +a { + color: #162f42; + text-decoration: underline; +} + +a:hover { + color: #0074c6; + text-decoration: underline; +} + +a img { + border-style: none; +} diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss index f135ca2c..0aec3988 100644 --- a/templates/LeftAndMain.ss +++ b/templates/LeftAndMain.ss @@ -5,7 +5,7 @@ <% base_tag %> $ApplicationName - +