summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--alpha/css/grid/default/narrow/debug-12.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/narrow/debug-16.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/narrow/debug-24.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/normal/debug-12.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/normal/debug-16.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/normal/debug-24.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/wide/debug-12.pngbin1032 -> 937 bytes
-rw-r--r--alpha/css/grid/default/wide/debug-16.pngbin1032 -> 935 bytes
-rw-r--r--alpha/css/grid/default/wide/debug-24.pngbin1032 -> 935 bytes
-rw-r--r--alpha/includes/alpha.inc2
-rw-r--r--alpha/includes/theme-settings-general.inc2
11 files changed, 2 insertions, 2 deletions
diff --git a/alpha/css/grid/default/narrow/debug-12.png b/alpha/css/grid/default/narrow/debug-12.png
index ff0c6b9..d6e204e 100644
--- a/alpha/css/grid/default/narrow/debug-12.png
+++ b/alpha/css/grid/default/narrow/debug-12.png
Binary files differ
diff --git a/alpha/css/grid/default/narrow/debug-16.png b/alpha/css/grid/default/narrow/debug-16.png
index ff0c6b9..e60e268 100644
--- a/alpha/css/grid/default/narrow/debug-16.png
+++ b/alpha/css/grid/default/narrow/debug-16.png
Binary files differ
diff --git a/alpha/css/grid/default/narrow/debug-24.png b/alpha/css/grid/default/narrow/debug-24.png
index ff0c6b9..1690e12 100644
--- a/alpha/css/grid/default/narrow/debug-24.png
+++ b/alpha/css/grid/default/narrow/debug-24.png
Binary files differ
diff --git a/alpha/css/grid/default/normal/debug-12.png b/alpha/css/grid/default/normal/debug-12.png
index ff0c6b9..7439915 100644
--- a/alpha/css/grid/default/normal/debug-12.png
+++ b/alpha/css/grid/default/normal/debug-12.png
Binary files differ
diff --git a/alpha/css/grid/default/normal/debug-16.png b/alpha/css/grid/default/normal/debug-16.png
index ff0c6b9..d6e204e 100644
--- a/alpha/css/grid/default/normal/debug-16.png
+++ b/alpha/css/grid/default/normal/debug-16.png
Binary files differ
diff --git a/alpha/css/grid/default/normal/debug-24.png b/alpha/css/grid/default/normal/debug-24.png
index ff0c6b9..86dfeb5 100644
--- a/alpha/css/grid/default/normal/debug-24.png
+++ b/alpha/css/grid/default/normal/debug-24.png
Binary files differ
diff --git a/alpha/css/grid/default/wide/debug-12.png b/alpha/css/grid/default/wide/debug-12.png
index ff0c6b9..bad7c03 100644
--- a/alpha/css/grid/default/wide/debug-12.png
+++ b/alpha/css/grid/default/wide/debug-12.png
Binary files differ
diff --git a/alpha/css/grid/default/wide/debug-16.png b/alpha/css/grid/default/wide/debug-16.png
index ff0c6b9..f47482d 100644
--- a/alpha/css/grid/default/wide/debug-16.png
+++ b/alpha/css/grid/default/wide/debug-16.png
Binary files differ
diff --git a/alpha/css/grid/default/wide/debug-24.png b/alpha/css/grid/default/wide/debug-24.png
index ff0c6b9..f4d8aeb 100644
--- a/alpha/css/grid/default/wide/debug-24.png
+++ b/alpha/css/grid/default/wide/debug-24.png
Binary files differ
diff --git a/alpha/includes/alpha.inc b/alpha/includes/alpha.inc
index e35f629..7b0a483 100644
--- a/alpha/includes/alpha.inc
+++ b/alpha/includes/alpha.inc
@@ -469,7 +469,7 @@ function alpha_debug_grid($settings, $columns) {
$debug = &drupal_static(__FUNCTION__);
$grid = alpha_grids($theme_key, $settings['grid']);
- if ($grid['type'] != 'fluid' && !$debug[$columns]) {
+ if ($grid['type'] != 'fluid' && !isset($debug[$columns])) {
$widths = array('narrow' => -3, 'normal' => -2, 'wide' => -1);
foreach ($widths as $type => $weight) {
diff --git a/alpha/includes/theme-settings-general.inc b/alpha/includes/theme-settings-general.inc
index 44df522..faede44 100644
--- a/alpha/includes/theme-settings-general.inc
+++ b/alpha/includes/theme-settings-general.inc
@@ -9,7 +9,7 @@ function alpha_theme_settings_general(&$form, &$form_state) {
$settings = alpha_settings($theme);
$optional = alpha_css_options($theme);
$responsive = alpha_css_options($theme, TRUE);
- krumo($settings);
+
$form['alpha_settings'] = array(
'#type' => 'vertical_tabs',
'#weight' => -10,