Merge pull request civicrm#21 from civicrm/4.5

colemanw · colemanw · commit ee51469f3619 · 2014-08-31T10:05:01.000+01:00
joomla.css - avoid clobbering core styles
diff --git a/admin/admin.civicrm.php b/admin/admin.civicrm.php
@@ -98,7 +98,7 @@ function civicrm_invoke() {
 
   $config = CRM_Core_Config::singleton();
   if (!$config->userFrameworkFrontend) {
-    $resources->addStyleFile('civicrm', 'css/joomla.css', -97, 'html-header');
+    $resources->addStyleFile('civicrm', 'css/joomla.css', -101, 'html-header');
   }
   else {
     $resources->addStyleFile('civicrm', 'css/joomla_frontend.css', -97, 'html-header');

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ function civicrm_invoke() {`
`98`	`98`
`99`	`99`	`$config = CRM_Core_Config::singleton();`
`100`	`100`	`if (!$config->userFrameworkFrontend) {`
`101`		`- $resources->addStyleFile('civicrm', 'css/joomla.css', -97, 'html-header');`
	`101`	`+ $resources->addStyleFile('civicrm', 'css/joomla.css', -101, 'html-header');`
`102`	`102`	`}`
`103`	`103`	`else {`
`104`	`104`	`$resources->addStyleFile('civicrm', 'css/joomla_frontend.css', -97, 'html-header');`