Skip to content
Snippets Groups Projects
Commit 066a7035 authored by Jeff Burnz's avatar Jeff Burnz
Browse files

*** empty log message ***

parent bd0756b8
No related branches found
Tags 8.x-1.0-alpha11
No related merge requests found
......@@ -336,6 +336,7 @@ div.view .views-admin-links a:hover{background:#FFF;}
#node-form .article-col-last .buttons #edit-preview,
#node-form .article-col-last .buttons #edit-delete{margin:2px 2px 2px 0;}
#node-form .article-col-first{float:left;width:69%;}
#node-form .vertical-tabs,#node-form .vertical-tabs-list,#node-form .vertical-tabs-list li{border-color:#DADADA !important}
/**
* Contains basic styles block config page.
......
......@@ -16,6 +16,13 @@
global $theme;
$block = $vars['block'];
if ($block->region == 'left') {
$block->region = 'sidebar-first';
}
if ($block->region == 'right') {
$block->region = 'sidebar-last';
}
// Set the block id.
if (theme_get_setting('cleanup_block_block_module_delta')) {
$vars['block_module_delta'] = 'block-'. $block->module .'-'. $block->delta;
......@@ -34,7 +41,7 @@ if (theme_get_setting('cleanup_block_classes_zebra')) {
}
if (theme_get_setting('cleanup_block_classes_region')) {
$classes[] = 'block-'. $block->region; // block-[region] class
$classes[] = 'block-'. safe_string($block->region); // block-[region] class
}
if (theme_get_setting('cleanup_block_classes_count')) {
......@@ -44,13 +51,13 @@ if (theme_get_setting('cleanup_block_classes_count')) {
// Add special classes to support the http://drupal.org/project/blocktheme module.
if (function_exists('blocktheme_preprocess_block') && isset($vars['blocktheme'])) {
$classes[] = $vars['blocktheme'];
$classes[] = $block->region .'-'. $vars['blocktheme'];
$classes[] = safe_string($block->region) .'-'. $vars['blocktheme'];
}
// Add special classes to support the http://drupal.org/project/block_class module.
if (function_exists('block_class') && block_class($block)) {
$classes[] = block_class($block);
$classes[] = $block->region .'-'. block_class($block);
$classes[] = safe_string($block->region) .'-'. block_class($block);
}
// Add support for Skinr module classes http://drupal.org/project/skinr.
......
......@@ -83,14 +83,6 @@ function adaptivetheme_username($object) {
return $output;
}
/**
* Set default form file input size
*/
function adaptivetheme_file($element) {
$element['#size'] = 60;
return theme_file($element);
}
/**
* Theme a form button.
*/
......
......@@ -55,8 +55,8 @@
<dd><?php print $block->module; ?></dd>
<dt><?php print t('Block Delta'); ?></dt>
<dd><?php print $block->delta; ?></dd>
<dt><?php print t('Block Region'); ?></dt>
<dd><?php print $block->region; ?></dd>
<dt><?php print t('Block Region ID'); ?></dt>
<dd><?php print '#'. safe_string($block->region); ?></dd>
<dt><?php print t('Block ID'); ?></dt>
<dd>
<?php if (!empty($block_module_delta)) { ?>
......
......@@ -96,7 +96,7 @@
settings[cleanup_comment_zebra] = 0
settings[cleanup_comment_wrapper_type] = 0
settings[cleanup_block_block_module_delta] = 0
settings[cleanup_block_block_module_delta] = 1
settings[cleanup_block_classes_module] = 0
settings[cleanup_block_classes_zebra] = 0
settings[cleanup_block_classes_region] = 0
......@@ -104,11 +104,11 @@
settings[cleanup_menu_menu_class] = 1
settings[cleanup_menu_leaf_class] = 1
settings[cleanup_menu_first_last_classes] = 0
settings[cleanup_menu_active_classes] = 0
settings[cleanup_menu_first_last_classes] = 1
settings[cleanup_menu_active_classes] = 1
settings[cleanup_links_type_class] = 1
settings[cleanup_links_active_classes] = 0
settings[cleanup_links_active_classes] = 1
settings[cleanup_item_list_zebra] = 0
settings[cleanup_item_list_first_last] = 0
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment