summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Siemssen2011-05-09 14:09:27 (GMT)
committer Sebastian Siemssen2011-05-09 14:09:27 (GMT)
commit85a455361f35fe3da33c734b4072ef0b4f29e35b (patch)
treea9f9acbf4ea1edfdfb642deb9ed844b9eccf097e
parent704408d1dfa6dd2112c5b2464d101e164b8ebd01 (diff)
jbeach also spots the little things...
-rw-r--r--alpha/includes/alpha.inc6
-rw-r--r--starterkits/omega-xhtml/starterkit_omega_xhtml.info5
2 files changed, 3 insertions, 8 deletions
diff --git a/alpha/includes/alpha.inc b/alpha/includes/alpha.inc
index d862b18..ce62da7 100644
--- a/alpha/includes/alpha.inc
+++ b/alpha/includes/alpha.inc
@@ -513,7 +513,7 @@ function alpha_include_grid($name, $columns) {
$path = $grid['path'] . '/' . $grid['primary'] . '/' . str_replace('_', '-', $name) . '-' . str_replace('_', '-', $grid['primary']);
if (!$settings['responsive']) {
- drupal_add_css($path . '-' . $columns . '.css', array('weight' => -1));
+ drupal_add_css($path . '-' . $columns . '.css', array('group' => 999));
}
else {
// Add the fallback (primary) grid layout for IE < 9
@@ -521,7 +521,7 @@ function alpha_include_grid($name, $columns) {
'data' => $path . '-' . $columns . '.css',
'basename' => 'ie::' . $path . '-' . $columns . '.css',
'browsers' => array('IE' => '(lt IE 9)&(!IEMobile)', '!IE' => FALSE),
- 'weight' => -1,
+ 'group' => 999,
));
// Loop through all possible grid layouts and add those that are enabled
@@ -529,7 +529,7 @@ function alpha_include_grid($name, $columns) {
if ($info['enabled']) {
$path = $grid['path'] . '/' . $layout . '/' . str_replace('_', '-', $name) . '-' . str_replace('_', '-', $layout);
- drupal_add_css($path . '-' . $columns . '.css', array('media' => $info['media'], 'weight' => -1));
+ drupal_add_css($path . '-' . $columns . '.css', array('media' => $info['media'], 'group' => 999));
}
}
}
diff --git a/starterkits/omega-xhtml/starterkit_omega_xhtml.info b/starterkits/omega-xhtml/starterkit_omega_xhtml.info
index a7b104e..54952c2 100644
--- a/starterkits/omega-xhtml/starterkit_omega_xhtml.info
+++ b/starterkits/omega-xhtml/starterkit_omega_xhtml.info
@@ -73,11 +73,6 @@ settings[alpha_layouts_alpha_default_wide_responsive] = '1'
settings[alpha_layouts_alpha_default_wide_media] = 'all and (min-width: 1220px)'
settings[alpha_layouts_alpha_default_narrow_responsive] = '1'
settings[alpha_layouts_alpha_default_narrow_media] = 'all and (min-width: 740px) and (min-device-width: 740px), (max-device-width: 800px) and (min-width: 740px) and (orientation:landscape)'
-settings[alpha_responsive_wide] = '1'
-settings[alpha_responsive_wide_media] = 'all and (min-width: 1220px)'
-settings[alpha_responsive_wide_css][wide.css] = 'wide.css'
-settings[alpha_responsive_narrow_css][narrow.css] = 'narrow.css'
-settings[alpha_responsive_normal_css][normal.css] = 'normal.css'
settings[alpha_viewport] = '1'
settings[alpha_viewport_initial_scale] = '1'
settings[alpha_viewport_min_scale] = '1'