diff --git a/code/AssetAdmin.php b/code/AssetAdmin.php index aa539c4d..952f83a3 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/cms_typography.css"); + Requirements::css("cms/css/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_right.css b/css/cms_right.css index 98e4a67e..be01f34a 100644 --- a/css/cms_right.css +++ b/css/cms_right.css @@ -89,6 +89,7 @@ body div.TreeDropdownField span.items { } .right form h2 { + color: #000; clear: both; } @@ -97,6 +98,7 @@ body div.TreeDropdownField span.items { width: auto; } + /** * Actions/Buttons */ diff --git a/css/cms_typography.css b/css/cms_typography.css deleted file mode 100644 index a7b1d693..00000000 --- a/css/cms_typography.css +++ /dev/null @@ -1,39 +0,0 @@ -/** - Everything is important, to make sure the cms has these styles. -*/ - -.right * { - font-family: Arial, Helvetica, sans-serif !important; -} - -.right p, ul, td, th { - font-size: 12px !important; -} - .right p { - color: #666 !important; - } - -.right h1, h2 { - color: #222 !important; -} - .right h1 { - font-size: 20px !important; - } - .right h2{ - font-family:"Helvetica Neue",Helvetica,Arial,Sans-serif !important; - font-size:12px !important; - font-weight:bold !important; - } -.right a { - color: #162f42 !important; - text-decoration: underline !important; -} - -.right a:hover { - color: #0074c6 !important; - text-decoration: underline !important; -} - -.right a img { - border-style: none !important; -} diff --git a/templates/LeftAndMain.ss b/templates/LeftAndMain.ss index 0aec3988..f135ca2c 100644 --- a/templates/LeftAndMain.ss +++ b/templates/LeftAndMain.ss @@ -5,7 +5,7 @@ <% base_tag %> $ApplicationName - +