summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--preprocess/preprocess-page.inc4
-rw-r--r--template.php14
2 files changed, 10 insertions, 8 deletions
diff --git a/preprocess/preprocess-page.inc b/preprocess/preprocess-page.inc
index cec9c04..7374a4f 100644
--- a/preprocess/preprocess-page.inc
+++ b/preprocess/preprocess-page.inc
@@ -372,8 +372,8 @@ $vars['main_menu_links'] = theme('links', $vars['primary_links'], array('cl
$vars['secondary_menu_links'] = theme('links', $vars['secondary_links'], array('class' => 'links secondary-menu'));
// NINESIXTY - Make sure framework styles are placed above all others.
-$vars['css_alt'] = omega_css_reorder($vars['css']);
-$vars['styles'] = drupal_get_css($vars['css_alt']);
+//$vars['css_alt'] = omega_css_reorder($vars['css']);
+//$vars['styles'] = drupal_get_css($vars['css_alt']);
// ACQUIA-MARINA
// Set site title, slogan, mission, page title & separator (unless using Page Title module)
diff --git a/template.php b/template.php
index c9444b2..ed31bb5 100644
--- a/template.php
+++ b/template.php
@@ -53,26 +53,28 @@ function omega_preprocess_page(&$vars, $hook) {
else {
$css_960 = drupal_get_path('theme', 'omega') .'/css/960.css';
}
- drupal_add_css($css_960, 'theme', 'all');
+ drupal_add_css($css_960, 'module', 'all');
// enable/disable optional CSS files
if (theme_get_setting('reset_css') == '1') {
- drupal_add_css(drupal_get_path('theme', 'omega') .'/css/reset.css', 'theme', 'all');
+ drupal_add_css(drupal_get_path('theme', 'omega') .'/css/reset.css', 'module', 'all');
}
if (theme_get_setting('text_css') == '1') {
- drupal_add_css(drupal_get_path('theme', 'omega') .'/css/text.css', 'theme', 'all');
+ drupal_add_css(drupal_get_path('theme', 'omega') .'/css/text.css', 'module', 'all');
}
if (theme_get_setting('regions_css') == '1') {
- drupal_add_css(drupal_get_path('theme', 'omega') .'/css/regions.css', 'theme', 'all');
+ drupal_add_css(drupal_get_path('theme', 'omega') .'/css/regions.css', 'module', 'all');
}
if (theme_get_setting('defaults_css') == '1') {
- drupal_add_css(drupal_get_path('theme', 'omega') .'/css/defaults.css', 'theme', 'all');
+ drupal_add_css(drupal_get_path('theme', 'omega') .'/css/defaults.css', 'module', 'all');
}
if (theme_get_setting('custom_css') == '1') {
- drupal_add_css(drupal_get_path('theme', 'omega') .'/css/custom.css', 'theme', 'all');
+ drupal_add_css(drupal_get_path('theme', 'omega') .'/css/custom.css', 'module', 'all');
}
// redeclare $styles
+ //krumo($vars['styles']);
$vars['styles'] = drupal_get_css();
+ //krumo($vars['styles']);
} // end preprocess_page
function omega_preprocess_node(&$vars, $hook) {