diff --git a/alpha/css/grid/default/narrow/debug-12.png b/alpha/css/grid/default/narrow/debug-12.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..d6e204e0f35bb21e1ac907ea552c701c4e70d645 100644 Binary files a/alpha/css/grid/default/narrow/debug-12.png and b/alpha/css/grid/default/narrow/debug-12.png differ diff --git a/alpha/css/grid/default/narrow/debug-16.png b/alpha/css/grid/default/narrow/debug-16.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..e60e268799420f52961e9544f16733fa56e95512 100644 Binary files a/alpha/css/grid/default/narrow/debug-16.png and b/alpha/css/grid/default/narrow/debug-16.png differ diff --git a/alpha/css/grid/default/narrow/debug-24.png b/alpha/css/grid/default/narrow/debug-24.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..1690e12285ff35fff568665a6587238854206017 100644 Binary files a/alpha/css/grid/default/narrow/debug-24.png and b/alpha/css/grid/default/narrow/debug-24.png differ diff --git a/alpha/css/grid/default/normal/debug-12.png b/alpha/css/grid/default/normal/debug-12.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..7439915176a6a2a9bb2b3dd19aedc95f53e26127 100644 Binary files a/alpha/css/grid/default/normal/debug-12.png and b/alpha/css/grid/default/normal/debug-12.png differ diff --git a/alpha/css/grid/default/normal/debug-16.png b/alpha/css/grid/default/normal/debug-16.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..d6e204e0f35bb21e1ac907ea552c701c4e70d645 100644 Binary files a/alpha/css/grid/default/normal/debug-16.png and b/alpha/css/grid/default/normal/debug-16.png differ diff --git a/alpha/css/grid/default/normal/debug-24.png b/alpha/css/grid/default/normal/debug-24.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..86dfeb510cd4fde30c9054cc90a0c32309bad914 100644 Binary files a/alpha/css/grid/default/normal/debug-24.png and b/alpha/css/grid/default/normal/debug-24.png differ diff --git a/alpha/css/grid/default/wide/debug-12.png b/alpha/css/grid/default/wide/debug-12.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..bad7c030dac49ea9216fdde2d91daa7039553247 100644 Binary files a/alpha/css/grid/default/wide/debug-12.png and b/alpha/css/grid/default/wide/debug-12.png differ diff --git a/alpha/css/grid/default/wide/debug-16.png b/alpha/css/grid/default/wide/debug-16.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..f47482d8ce8e00db7a50e71df7caf923b9a38988 100644 Binary files a/alpha/css/grid/default/wide/debug-16.png and b/alpha/css/grid/default/wide/debug-16.png differ diff --git a/alpha/css/grid/default/wide/debug-24.png b/alpha/css/grid/default/wide/debug-24.png index ff0c6b9e2b4af902a51435849f95c6cee5866350..f4d8aeb2cd131ff5854b363efe9d62eb8b53c463 100644 Binary files a/alpha/css/grid/default/wide/debug-24.png and b/alpha/css/grid/default/wide/debug-24.png differ diff --git a/alpha/includes/alpha.inc b/alpha/includes/alpha.inc index e35f629665220a1aa6c082e2238925b6ad8dc2ce..7b0a48370c5678886e5cabf9cdbf2982bf0a4bf1 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 44df522caa29712e89fb12843680c07bbf6cc827..faede44aaa758c470cec77f270e37c8195ced9c9 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,