=== modified file 'scripts/create-zen-subtheme.sh'
--- scripts/create-zen-subtheme.sh 2010-03-26 22:48:42 +0000
+++ scripts/create-zen-subtheme.sh 2010-09-15 11:55:21 +0000
@@ -1,18 +1,24 @@
#!/bin/bash
-# This script creates a new subtheme for zen following the instructions on drupal.org/node/226507
+# This script creates a new subtheme for zen-6.x-2.x
# Usage:
# - open a shell, navigate to the themes directory (where zen is installed)
# - run this script (whereever it is) from that directory
# Based on script submitted here: drupal.org/node/276120
+#~ Chain of events:
+#~ * copy STARTERKIT/ from zen/ and rename to NEWNAME (lowercase/underscores)
+#~ * rename STARTERKIT.info.txt to NEWNAME.info
+#~ * edit NEWNAME.info name and description field
+#~ * remove unneeded layout-{!chosen layout}.css file and reference in NEWNAME.info
+#~ * replace all occurances of STARTERKIT in template.php & theme-settings.php with NEWNAME
[ -d zen/STARTERKIT ] || { echo "This script must be run from the themes directory (where zen is located)"; exit 1; }
-echo "Enter a human-readable subtheme name:"
-read -e INPUTNAME
+echo -n "Enter a name for your theme: "
+read -e NAME
-NAME=`echo $INPUTNAME | tr '[:upper:]' '[:lower:]' | sed -e 's/[ -]/_/g' -e 's/[^a-z0-9_]//g'`
-SEDNAME=`echo $INPUTNAME | sed -e 's/"/\\"/g'`
+HUMAN=`echo $NAME | sed -e 's/[^a-zA-Z0-9\ ]//g'`
+NAME=`echo $NAME | tr [:upper:] [:lower:] | sed -e 's/[\-\ ]/_/g' -e 's/[^a-z0-9_]//g'`
echo
echo "Use SASS source files to generate CSS?"
@@ -34,35 +40,41 @@ do
fi
done
-echo -n "Choose a page layout type [f]ixed or [l]iquid for subtheme $NAME: "
-read -e LAYOUT
-
-if [ $LAYOUT = "f" ]; then
- LAYOUTFILE=layout-fixed.$EXT
-elif [ $LAYOUT = "l" ]; then
- LAYOUTFILE=layout-liquid.$EXT
-else
- echo Invalid layout type.
- exit
-fi
+echo "Choose a page layout"
+select LAYOUT in Fixed Liquid
+do
+ if [ $LAYOUT = "Liquid" ]; then
+ DELCSS="layout-fixed"
+ CSS="layout-liquid"
+ break
+ else
+ DELCSS="layout-liquid"
+ CSS="layout-fixed"
+ break
+ fi
+done
cp -r zen/STARTERKIT $NAME
if [ $SASS = "Yes" ]; then
mkdir $DESTDIR
fi
-#
-# Change the theme name (the line 'name = ...') to the new subtheme name
-#
-sed 's/STARTERKIT/'$NAME'/g' $NAME/STARTERKIT.info.txt | sed 's/^\(name *= *\).*/\1'"$SEDNAME"'/g' > $NAME/$NAME.info
- rm $NAME/STARTERKIT.info.txt
-
-cp $SRCDIR/$LAYOUTFILE $DESTDIR/layout.$EXT
-cp $SRCDIR/print.$EXT $DESTDIR/
-cp $SRCDIR/html-elements.$EXT $DESTDIR/
-cp $SRCDIR/zen.$EXT $DESTDIR/$NAME.$EXT
-sed 's/STARTERKIT/'$NAME'/g' zen/STARTERKIT/template.php > $NAME/template.php
-sed 's/STARTERKIT/'$NAME'/g' zen/STARTERKIT/theme-settings.php > $NAME/theme-settings.php
+# Create .info file
+# Remove layout css file and references not required
+sed -e 's/STARTERKIT/'$NAME'/g' -e 's/Zen Sub-theme Starter Kit/'"$HUMAN"'/g' -e 's/^\(description = \).*$/\1A Zen sub-theme/g' -e 's/'$DELCSS'/'$CSS'/g' $NAME/STARTERKIT.info.txt > $NAME/$NAME.info
+rm $NAME/STARTERKIT.info*
+rm $NAME/css/$DELCSS*
+
+# Replace all occurances of STARTERKIT with theme name in template and theme-settings files
+sed 's/STARTERKIT/'$NAME'/g' $NAME/template.php > /tmp/zen-template.php
+mv /tmp/zen-template.php $NAME/template.php
+sed 's/STARTERKIT/'$NAME'/g' $NAME/theme-settings.php > /tmp/zen-theme-settings.php
+mv /tmp/zen-theme-settings.php $NAME/theme-settings.php
+
+echo New theme folder $NAME created in `pwd`
+
+exit 0
+
if [ $SASS = "Yes" ]; then
cd $DESTDIR
=== modified file 'sites/all/modules/adminrole/adminrole.module'
--- sites/all/modules/adminrole/adminrole.module 2010-08-24 22:12:40 +0000
+++ sites/all/modules/adminrole/adminrole.module 2010-09-16 01:24:46 +0000
@@ -8,38 +8,40 @@
*/
/**
- * Implements hook_form_FORM_ID_alter().
+ * Implementation of hook_menu().
*/
-function adminrole_form_user_admin_settings_alter(&$form, $form_state) {
- // Administrative role option.
- $form['admin_role'] = array(
- '#type' => 'fieldset',
- '#title' => t('Administrator role'),
- );
+function adminrole_menu() {
+ $items = array();
- // Do not allow users to set the anonymous or authenticated user roles as the
- // administrator role.
- $roles = user_roles();
- unset($roles[DRUPAL_ANONYMOUS_RID]);
- unset($roles[DRUPAL_AUTHENTICATED_RID]);
-
- $form['admin_role']['user_admin_role'] = array(
- '#type' => 'select',
- '#title' => t('Administrator role'),
- '#default_value' => variable_get('user_admin_role', 0),
- '#options' => array(0 => t('Disabled')) + $roles,
- '#description' => t('This role will be automatically assigned new permissions whenever a module is enabled.'),
+ $items['admin/user/adminrole'] = array(
+ 'title' => 'Admin role',
+ 'page callback' => 'drupal_get_form',
+ 'page arguments' => array('adminrole_settings_form'),
+ 'access arguments' => array('administer permissions'),
+ 'type' => MENU_NORMAL_ITEM,
+ 'file' => 'adminrole.settings.inc',
);
- // Ensure the save/reset buttons have a lower weight than our fieldset.
- $form['buttons'] += array('#weight' => 100);
+ return $items;
+}
+
+/**
+ * Implementation of hook_theme().
+ */
+function adminrole_theme() {
+ return array(
+ 'adminrole_perm_exlusions' => array(
+ 'arguments' => array('element' => NULL),
+ 'file' => 'adminrole.settings.inc',
+ ),
+ );
}
/**
* Implements hook_form_alter().
*/
function adminrole_form_alter(&$form, $form_state, $form_id) {
- if (in_array($form_id, array('system_modules', 'user_admin_settings'))) {
+ if ($form_id == 'system_modules') {
$form['#submit'][] = 'adminrole_update_permissions';
}
}
=== added file 'sites/all/modules/adminrole/adminrole.settings.inc'
--- sites/all/modules/adminrole/adminrole.settings.inc 1970-01-01 00:00:00 +0000
+++ sites/all/modules/adminrole/adminrole.settings.inc 2010-09-16 01:27:32 +0000
@@ -0,0 +1,114 @@
+ 'fieldset',
+ '#title' => t('Administrator role'),
+ );
+
+ // Do not allow users to set the anonymous or authenticated user roles as the
+ // administrator role.
+ $roles = user_roles();
+ unset($roles[DRUPAL_ANONYMOUS_RID]);
+ unset($roles[DRUPAL_AUTHENTICATED_RID]);
+
+ $form['user_admin_role'] = array(
+ '#type' => 'select',
+ '#title' => t('Administrator role'),
+ '#default_value' => variable_get('user_admin_role', 0),
+ '#options' => array(0 => t('Disabled')) + $roles,
+ '#description' => t('This role will be automatically assigned all permissions (except the below) whenever a module is enabled, and upon submitting this form. Any changes made in the \'Permissions\' screen will be overwritten.'),
+ );
+
+ $exclusions = variable_get('adminrole_exclude_permissions', array());
+ $form['adminrole_perm_exlusions'] = array(
+ '#type' => 'checkboxes',
+ '#title' => t('Exclusions'),
+ '#description' => t('Select the permissions below you DO NOT want the administrator role to be assigned.'),
+ '#options' => array(),
+ '#default_value' => array(),
+ '#theme' => 'adminrole_perm_exlusions',
+ '#modules' => array(),
+ );
+
+ foreach (module_list(FALSE, FALSE, TRUE) as $module) {
+ $permissions = module_invoke($module, 'perm');
+
+ if (!$permissions) {
+ continue;
+ }
+
+ $default_value = array_intersect($exclusions, $permissions);
+ $form['adminrole_perm_exlusions']['#options'] += drupal_map_assoc($permissions, 't');
+ $form['adminrole_perm_exlusions']['#default_value'] += $default_value;
+
+ $form['adminrole_perm_exlusions']['#modules'][$module] = array(
+ 'module' => $module,
+ 'permissions' => $permissions,
+ 'excluded' => count($default_value),
+ );
+ }
+ $form = system_settings_form($form);
+ $form['#submit'] = array('adminrole_settings_form_submit');
+ return $form;
+}
+
+function adminrole_settings_form_submit($form, &$form_state) {
+ if ($op == t('Reset to defaults')) {
+ variable_del('user_admin_role');
+ variable_del('adminrole_exclude_permissions');
+ drupal_set_message(t('The configuration options have been reset to their default values.'));
+ }
+ else {
+ variable_set('user_admin_role', $form_state['values']['user_admin_role']);
+ $perms = array_filter($form_state['values']['adminrole_perm_exlusions']);
+ variable_set('adminrole_exclude_permissions', array_keys($perms));
+ }
+
+ adminrole_update_permissions();
+}
+
+/**
+ * Theme exlusions checkboxes
+ */
+function theme_adminrole_perm_exlusions($element) {
+
+ $rows = array();
+ foreach ($element['#modules'] as $info) {
+ $rows[] = array(
+ array('data' => t('@module module', array('@module' => $info['module'])), 'class' => 'module', 'id' => 'module-'. $info['module'], 'colspan' => 2)
+ );
+
+ foreach ($info['permissions'] as $perm) {
+ $row = array();
+ // We want to set the title in a different table column
+ // (title is localized version of $perm)
+ $row[] = array('data' => $element[$perm]['#title'], 'class' => 'permission');
+ unset ($element[$perm]['#title']);
+ $row[] = array('data' => drupal_render($element[$perm]), 'class' => 'checkbox', 'title' => 'admin role' .' : '. t($perm));
+ $rows[] = $row;
+ }
+ }
+ $header = array(t('Permission'), array('data' => t('Excluded'), 'class' => 'checkbox'));
+ $output = theme('table', $header, $rows, array('id' => 'permissions'));
+ $fs = array(
+ '#type' => 'fieldset',
+ '#title' => t('Exclusions'),
+ '#collapsible' => TRUE,
+ '#collapsed' => empty($element['#default_value']),
+ '#value' => $output,
+ );
+ return theme('fieldset', $fs);
+}
=== modified file 'sites/all/modules/computed_field/computed_field.module'
--- sites/all/modules/computed_field/computed_field.module 2010-09-09 16:20:12 +0000
+++ sites/all/modules/computed_field/computed_field.module 2010-09-09 20:19:58 +0000
@@ -65,12 +65,13 @@ function computed_field_field_settings($
'#title' => t('Data Type'),
'#description' => t('The SQL datatype to store this field in.'),
'#default_value' => !empty($field['data_type']) ? $field['data_type'] : 'varchar',
- '#options' => array('int' => 'int', 'float' => 'float', 'varchar' => 'varchar', 'text' => 'text', 'longtext' => 'longtext'),
+ '#options' => array('int' => 'int', 'float' => 'float', 'decimal' => 'decimal' , 'varchar' => 'varchar', 'text' => 'text', 'longtext' => 'longtext'),
'#required' => FALSE,
);
$form['database']['data_length'] = array(
'#type' => 'textfield',
'#title' => t('Data Length'),
+ '#description' => t('For decimal data type, use the format "PRECISION,SCALE"; for float, double is used when greater than 7.'),
'#default_value' => !empty($field['data_length']) ? $field['data_length'] : NULL,
'#required' => FALSE,
);
@@ -110,13 +111,31 @@ function computed_field_field_settings($
$columns['value']['type'] = 'text';
$columns['value']['size'] = 'big';
}
+ else if ($field['data_type'] == 'decimal') {
+ $columns['value']['type'] = 'numeric';
+ if (isset($field['data_length'])){
+ $precision_scale = explode(',',$field['data_length']);
+ }
+ $columns['value']['precision'] = (isset($precision_scale[0]) && is_numeric($precision_scale[0])) ? $precision_scale[0] : 10;
+ $columns['value']['scale'] = (isset($precision_scale[1]) && is_numeric($precision_scale[1])) ? $precision_scale[1] : 2;
+ }
+ elseif ($field['data_type'] == 'float') {
+ //Float is stored as double if 'size' is 'big'.
+ //Float has a precision of 7 digits, so if you set a greater length, double is used
+ $columns['value']['type'] = 'float';
+ if (isset($field['data_length']) && $field['data_length'] > 7) {
+ $columns['value']['size'] = 'big';
+ } else {
+ $columns['value']['size'] = 'normal';
+ }
+ }
else {
$columns['value']['type'] = isset($field['data_type']) ? $field['data_type'] : 'varchar';
+ if ($columns['value']['type'] != 'text') {
+ $columns['value']['length'] = isset($field['data_length']) ? $field['data_length'] : 32;
+ }
}
- // text and longtext should not have a length, so we ignore it
- if (!($field['data_type'] == 'text' || $field['data_type'] == 'longtext')) {
- $columns['value']['length'] = isset($field['data_length']) ? $field['data_length'] : 32;
- }
+
$columns['value']['not NULL'] = isset($field['data_not_NULL']) ? $field['data_not_NULL'] : TRUE;
$columns['value']['sortable'] = isset($field['data_sortable']) ? $field['data_sortable'] : FALSE;
if ($field['data_default'] != '') {
=== modified file 'sites/all/modules/feeds/feeds_ui/feeds_ui.admin.inc'
--- sites/all/modules/feeds/feeds_ui/feeds_ui.admin.inc 2010-07-19 13:36:34 +0000
+++ sites/all/modules/feeds/feeds_ui/feeds_ui.admin.inc 2010-08-26 20:17:47 +0000
@@ -530,6 +530,7 @@ function feeds_ui_mapping_form(&$form_st
);
if (is_array($mappings)) {
+ $form['mappings']['#tree'] = TRUE;
foreach ($mappings as $i => $mapping) {
$mappings[$i]['source'] = isset($source_options) ? $source_options[$mappings[$i]['source']] : $mappings[$i]['source'];
@@ -553,6 +554,15 @@ function feeds_ui_mapping_form(&$form_st
'#prefix' => '',
'#suffix' => '
',
);
+
+ // Declare the mappings data in the hidden field, so later
+ // the full mapping data will be submitted in $form_state['values']['mappings'].
+ foreach($mapping as $k => $v) {
+ $form['mappings'][$i][$k] = array (
+ '#type' => 'hidden',
+ '#value' => $v,
+ );
+ }
}
}
@@ -595,7 +605,19 @@ function feeds_ui_mapping_form(&$form_st
function feeds_ui_mapping_form_add_submit($form, &$form_state) {
$importer = $form['#importer'];
try {
- $importer->processor->addMapping($form_state['values']['source'], $form_state['values']['target']);
+ // addMapping method is now used for custom FeedsProcessor
+ // to declare what they want to do when mapping is added
+ // e.g. FeedsDataProcessor
+ if (method_exists($importer->processor, 'addMapping')) {
+ $importer->processor->addMapping($form_state['values']['source'], $form_state['values']['target']);
+ }
+
+ $form_state['values']['mappings'][] = array(
+ 'source' => $form_state['values']['source'],
+ 'target' => $form_state['values']['target'],
+ 'unique' => FALSE,
+ );
+ $importer->processor->addConfig($form_state['values']);
$importer->processor->save();
drupal_set_message(t('Mapping has been added.'));
}
@@ -614,16 +636,23 @@ function feeds_ui_mapping_form_submit($f
// step, that's fine.
if (isset($form_state['values']['unique_flags'])) {
foreach ($form_state['values']['unique_flags'] as $k => $v) {
- $processor->setUnique($mappings[$k]['source'], $mappings[$k]['target'], $v);
+ $form_state['values']['mappings'][$k]['unique'] = $v;
}
}
foreach ($form_state['values']['remove_flags'] as $k => $v) {
if ($v) {
- $processor->removeMapping($mappings[$k]['source'], $mappings[$k]['target']);
+ unset($form_state['values']['mappings'][$k]);
+ // Keep or keys clean.
+ $form_state['values']['mappings'] = array_values($form_state['values']['mappings']);
}
}
drupal_set_message(t('Your changes have been saved.'));
+
+ // Because now full mapping is submitted, so no further validation for
+ // out of sync mappings is needed (i.e. the mapping is modified by other people while
+ // we are at it). Simply replace it.
+ $processor->addConfig($form_state['values']);
$processor->save();
}
=== modified file 'sites/all/modules/feeds/plugins/FeedsDataProcessor.inc'
--- sites/all/modules/feeds/plugins/FeedsDataProcessor.inc 2010-08-15 16:00:04 +0000
+++ sites/all/modules/feeds/plugins/FeedsDataProcessor.inc 2010-08-26 20:17:47 +0000
@@ -133,9 +133,6 @@ class FeedsDataProcessor extends FeedsPr
throw new Exception(t('Field !field_name already exists as a mapping target. Remove it from mapping if you would like to map another source to it. Remove it from !data_table table if you would like to change its definition.', array('!field_name' => $field_name, '!data_table' => l($this->table()->get('name'), 'admin/content/data'))));
}
}
-
- // Let parent populate the mapping configuration.
- parent::addMapping($source, $target, $unique);
}
/**
=== modified file 'sites/all/modules/feeds/plugins/FeedsProcessor.inc'
--- sites/all/modules/feeds/plugins/FeedsProcessor.inc 2010-08-15 16:00:04 +0000
+++ sites/all/modules/feeds/plugins/FeedsProcessor.inc 2010-08-26 20:17:47 +0000
@@ -151,54 +151,6 @@ abstract class FeedsProcessor extends Fe
}
/**
- * Add a mapping to existing mappings.
- *
- * @param $source
- * A string that identifies a source element.
- * @param $target
- * A string that identifies a target element.
- * @param $unique
- * A boolean that defines whether the target value should be unique. If
- * TRUE only one item with a given target value can exist on the local
- * system. Compare with existingItemId() and uniqueTargets().
- */
- public function addMapping($source, $target, $unique = FALSE) {
- if (!empty($source) && !empty($target)) {
- $this->config['mappings'][] = array(
- 'source' => $source,
- 'target' => $target,
- 'unique' => $unique,
- );
- }
- }
-
- /**
- * Set unique state of a mapping target.
- */
- public function setUnique($source, $target, $unique) {
- if (!empty($source) && !empty($target)) {
- foreach ($this->config['mappings'] as $k => $mapping) {
- if ($mapping['source'] == $source && $mapping['target'] == $target) {
- $this->config['mappings'][$k]['unique'] = $unique;
- }
- }
- }
- }
-
- /**
- * Remove a mapping.
- */
- public function removeMapping($source, $target) {
- foreach ($this->config['mappings'] as $k => $mapping) {
- if ($mapping['source'] == $source && $mapping['target'] == $target) {
- unset($this->config['mappings'][$k]);
- }
- }
- // Keep or keys clean.
- $this->config['mappings'] = array_values($this->config['mappings']);
- }
-
- /**
* Get mappings.
*/
public function getMappings() {
=== modified file 'sites/all/themes/zen/zen/layout-fixed.css'
--- sites/all/themes/zen/zen/layout-fixed.css 2010-06-01 16:27:48 +0000
+++ sites/all/themes/zen/zen/layout-fixed.css 2010-09-14 13:33:59 +0000
@@ -1,307 +1,150 @@
-/* $Id: layout-fixed.css,v 1.5.2.3 2009/02/13 19:20:19 johnalbin Exp $ */
-
-/*
- * LAYOUT STYLES
- *
- * Define CSS classes to create a table-free, 3-column, 2-column, or single
- * column layout depending on whether blocks are enabled in the left or right
- * columns.
- *
- * This layout is based on the Zen Columns layout method.
- * http://drupal.org/node/201428
- *
- * Only CSS that affects the layout (positioning) of major elements should be
- * listed here. Such as:
- * display, position, float, clear, width, height, min-width, min-height
- * margin, border, padding, overflow
- */
-
-
-/** body **/
- body
- {
- }
-
- #page,
- #closure-blocks
- {
- /*
- * If you want to make the page a fixed width and centered in the viewport,
- * this is the standards-compliant way to do that. See also the ie.css file
- * for the necessary IE5 hack to center a div.
- */
- margin-left: auto;
- margin-right: auto;
- width: 960px;
- }
-
- #page-inner
- {
- }
-
- #navigation-top,
- #navigation
- {
- position: absolute; /* Take the named anchors out of the doc flow */
- left: -10000px; /* and prevent any anchor styles from appearing. */
- }
-
- #skip-to-nav
- {
- float: right;
- margin: 0 !important;
- font-size: 0.8em;
- }
-
- #skip-to-nav a:link, #skip-to-nav a:visited
- {
- color: #fff; /* Same as background color of page */
- }
-
- #skip-to-nav a:hover
- {
- color: #000;
- text-decoration: none;
- }
-
- /* Alternatively, the skip-to-nav link can be completely hidden until a user tabs
- to the link. Un-comment the following CSS to use this technique. */
- /*
- #skip-to-nav a, #skip-to-nav a:hover, #skip-to-nav a:visited
- {
- position: absolute;
- left: 0;
- top: -500px;
- width: 1px;
- height: 1px;
- overflow: hidden;
- }
-
- #skip-to-nav a:active, #skip-to-nav a:focus
- {
- position: static;
- width: auto;
- height: auto;
- }
- */
-
-/** header **/
- #header
- {
- }
-
- #header-inner
- {
- }
-
- #logo-title
- {
- }
-
- #logo
- {
- float: left;
- }
-
- #site-name
- {
- }
-
- #site-slogan
- {
- }
-
- #header-blocks
- {
- clear: both; /* Clear the logo */
- }
-
-/** main (container for everything else) **/
- #main
- {
- position: relative;
- }
-
- #main-inner
- {
- }
-
-/** content **/
- #content,
- .no-sidebars #content
- {
- float: left;
- width: 960px;
- margin-left: 0;
- margin-right: -960px; /* Negative value of #content's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
- }
-
- .sidebar-left #content
- {
- width: 760px;
- margin-left: 200px; /* The width of #sidebar-left. */
- margin-right: -960px; /* Negative value of #content's width + left margin. */
- }
-
- .sidebar-right #content
- {
- width: 760px;
- margin-left: 0;
- margin-right: -760px; /* Negative value of #content's width + left margin. */
- }
-
- .two-sidebars #content
- {
- width: 560px;
- margin-left: 200px; /* The width of #sidebar-left */
- margin-right: -760px; /* Negative value of #content's width + left margin. */
- }
-
- #content-inner
- {
- margin: 0;
- padding: 0;
- }
-
-/** navbar **/
- #navbar
- {
- float: left;
- width: 100%;
- margin-left: 0;
- margin-right: -100%; /* Negative value of #navbar's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
- height: 3.6em; /* The navbar can have any arbritrary height. We picked one
- that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6
- Set this to the same value as the margin-top below. */
- }
-
- .with-navbar #content,
- .with-navbar #sidebar-left,
- .with-navbar #sidebar-right
- {
- margin-top: 3.6em; /* Set this to the same value as the navbar height above. */
- }
-
- #navbar-inner
- {
- }
-
- #search-box
- {
- width: 200px;
- margin-right: -200px; /* Negative value of #search-box's width. */
- float: left;
- }
-
- #primary
- {
- margin-left: 200px; /* Width of search-box */
- }
-
- #secondary
- {
- margin-left: 200px; /* Width of search-box */
- }
-
- #navbar ul /* Primary and secondary links */
- {
- margin: 0;
- padding: 0;
- text-align: left;
- }
-
- #navbar li /* A simple method to get navbar links to appear in one line. */
- {
- float: left;
- padding: 0 10px 0 0;
- }
-
- /* There are many methods to get navbar links to appear in one line.
- * Here's an alternate method: */
- /*
- #navbar li
- {
- display: inline;
- padding: 0 10px 0 0;
- }
- */
-
-/** sidebar-left **/
- #sidebar-left
- {
- float: left;
- width: 200px;
- margin-left: 0;
- margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
- }
-
- #sidebar-left-inner
- {
- margin: 0 20px 0 0;
- padding: 0;
- }
-
-/** sidebar-right **/
- #sidebar-right
- {
- float: left;
- width: 200px;
- margin-left: 760px; /* Width of content + sidebar-left. */
- margin-right: -960px; /* Negative value of #sidebar-right's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
- }
-
- #sidebar-right-inner
- {
- margin: 0 0 0 20px;
- padding: 0;
- }
-
-/** footer **/
- #footer
- {
- }
-
- #footer-inner
- {
- }
-
-/** closure **/
- #closure-blocks /* See also the #page declaration above that this div shares. */
- {
- }
-
-/** Prevent overflowing content **/
- #header,
- #content,
- #navbar,
- #sidebar-left,
- #sidebar-right,
- #footer,
- #closure-blocks
- {
- overflow: visible;
- word-wrap: break-word; /* A very nice CSS3 property */
- }
-
- #navbar
- {
- overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
- }
-
- /* If a div.clear-block doesn't have any content after it and its bottom edge
- touches the bottom of the viewport, Firefox and Safari will mistakenly
- place several pixels worth of space between the bottom of the div and the
- bottom of the viewport. Uncomment this CSS property to fix this.
- Note: with some over-large content, this property might cause scrollbars
- to appear on the #page div.
- */
- /*
- #page
- {
- overflow-y: hidden;
- }
- */
+#page,
+#closure-blocks {
+ margin-left: auto;
+ margin-right: auto;
+ width: 960px;
+}
+
+#navigation-top,
+#navigation {
+ position: absolute;
+ left: -10000px;
+}
+
+#skip-to-nav {
+ float: right;
+ margin: 0 !important;
+ font-size: 0.8em;
+}
+#skip-to-nav a:link a:visited {
+ color: white;
+}
+#skip-to-nav a:hover {
+ color: black;
+ text-decoration: none;
+}
+
+#logo {
+ float: left;
+}
+
+#header-blocks {
+ clear: both;
+}
+
+#main {
+ position: relative;
+}
+
+#content,
+.no-sidebars #content {
+ float: left;
+ width: 960px;
+ margin-left: 0;
+ margin-right: -960px;
+ padding: 0;
+}
+
+.sidebar-left #content {
+ width: 760px;
+ margin-left: 200px;
+ margin-right: -960px;
+}
+
+.sidebar-right #content {
+ width: 760px;
+ margin-left: 0;
+ margin-right: -760px;
+}
+
+.two-sidebars #content {
+ width: 560px;
+ margin-left: 200px;
+ margin-right: -760px;
+}
+
+#content-inner {
+ margin: 0;
+ padding: 0;
+}
+
+#navbar {
+ float: left;
+ width: 100%;
+ margin-left: 0;
+ margin-right: -100%;
+ padding: 0;
+ height: 3.6em;
+}
+
+.with-navbar #content,
+.with-navbar #sidebar-left,
+.with-navbar #sidebar-right {
+ margin-top: 3.6em;
+}
+
+#search-box {
+ width: 200px;
+ margin-right: -200px;
+ float: left;
+}
+
+#primary {
+ margin-left: 200px;
+}
+
+#secondary {
+ margin-left: 200px;
+}
+
+#navbar ul {
+ margin: 0;
+ padding: 0;
+ text-align: left;
+}
+
+#navbar li {
+ float: left;
+ padding: 0 10px 0 0;
+}
+
+#sidebar-left {
+ float: left;
+ width: 200px;
+ margin-left: 0px;
+ margin-right: -200px;
+ padding: 0;
+}
+
+#sidebar-left-inner {
+ margin: 0 20px 0 0;
+ padding: 0;
+}
+
+#sidebar-right {
+ float: left;
+ width: 200px;
+ margin-left: 760px;
+ margin-right: -960px;
+ padding: 0;
+}
+
+#sidebar-right-inner {
+ margin: 0 0 0 20px;
+ padding: 0;
+}
+
+#header,
+#content,
+#navbar,
+#sidebar-left,
+#sidebar-right,
+#footer,
+#closure-blocks {
+ overflow: visible;
+ word-wrap: break-word;
+}
+
+#navbar {
+ overflow: hidden;
+}
=== modified file 'sites/all/themes/zen/zen/layout-liquid.css'
--- sites/all/themes/zen/zen/layout-liquid.css 2009-08-28 19:08:58 +0000
+++ sites/all/themes/zen/zen/layout-liquid.css 2010-09-14 13:28:23 +0000
@@ -1,297 +1,146 @@
-/* $Id: layout-liquid.css,v 1.5.2.4 2009/02/13 19:30:50 johnalbin Exp $ */
-
-/*
- * LAYOUT STYLES
- *
- * Define CSS classes to create a table-free, 3-column, 2-column, or single
- * column layout depending on whether blocks are enabled in the left or right
- * columns.
- *
- * This layout is based on the Zen Columns layout method.
- * http://drupal.org/node/201428
- *
- * Only CSS that affects the layout (positioning) of major elements should be
- * listed here. Such as:
- * display, position, float, clear, width, height, min-width, min-height
- * margin, border, padding, overflow
- */
-
-
-/** body **/
- body
- {
- }
-
- #page,
- #closure-blocks
- {
- min-width: 960px; /* Don't allow the browser to make the site unreadable. */
- }
-
- #page-inner
- {
- }
-
- #navigation-top,
- #navigation
- {
- position: absolute; /* Take the named anchors out of the doc flow */
- left: -10000px; /* and prevent any anchor styles from appearing. */
- }
-
- #skip-to-nav
- {
- float: right;
- margin: 0 !important;
- font-size: 0.8em;
- }
-
- #skip-to-nav a:link, #skip-to-nav a:visited
- {
- color: #fff; /* Same as background color of page */
- }
-
- #skip-to-nav a:hover
- {
- color: #000;
- text-decoration: none;
- }
-
- /* Alternatively, the skip-to-nav link can be completely hidden until a user tabs
- to the link. Un-comment the following CSS to use this technique. */
- /*
- #skip-to-nav a, #skip-to-nav a:hover, #skip-to-nav a:visited
- {
- position: absolute;
- left: 0;
- top: -500px;
- width: 1px;
- height: 1px;
- overflow: hidden;
- }
-
- #skip-to-nav a:active, #skip-to-nav a:focus
- {
- position: static;
- width: auto;
- height: auto;
- }
- */
-
-/** header **/
- #header
- {
- }
-
- #header-inner
- {
- }
-
- #logo-title
- {
- }
-
- #logo
- {
- float: left;
- }
-
- #site-name
- {
- }
-
- #site-slogan
- {
- }
-
- #header-blocks
- {
- clear: both; /* Clear the logo */
- }
-
-/** main (container for everything else) **/
- #main
- {
- position: relative;
- }
-
- #main-inner
- {
- }
-
-/** content **/
- #content
- {
- float: left;
- width: 100%;
- margin-left: 0;
- margin-right: -100%; /* Negative value of #content's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #content-inner. */
- }
-
- #content-inner,
- .no-sidebars #content-inner
- {
- margin: 0;
- padding: 0;
- }
-
- .sidebar-left #content-inner
- {
- padding-left: 200px; /* The width + left margin of #sidebar-left. */
- padding-right: 0;
- }
-
- .sidebar-right #content-inner
- {
- padding-left: 0;
- padding-right: 200px; /* The width + right margin of #sidebar-right. */
- }
-
- .two-sidebars #content-inner
- {
- padding-left: 200px; /* The width + left margin of #sidebar-left. */
- padding-right: 200px; /* The width + right margin of #sidebar-right. */
- }
-
-/** navbar **/
- #navbar
- {
- float: left;
- width: 100%;
- margin-left: 0;
- margin-right: -100%; /* Negative value of #navbar's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
- height: 3.6em; /* The navbar can have any arbritrary height. We picked one
- that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6
- Set this to the same value as the margin-top below. */
- }
-
- .with-navbar #content,
- .with-navbar #sidebar-left,
- .with-navbar #sidebar-right
- {
- margin-top: 3.6em; /* Set this to the same value as the navbar height above. */
- }
-
- #navbar-inner
- {
- }
-
- #search-box
- {
- width: 200px;
- margin-right: -200px; /* Negative value of #search-box's width. */
- float: left;
- }
-
- #primary
- {
- margin-left: 200px; /* Width of search-box */
- }
-
- #secondary
- {
- margin-left: 200px; /* Width of search-box */
- }
-
- #navbar ul /* Primary and secondary links */
- {
- margin: 0;
- padding: 0;
- text-align: left;
- }
-
- #navbar li /* A simple method to get navbar links to appear in one line. */
- {
- float: left;
- padding: 0 10px 0 0;
- }
-
- /* There are many methods to get navbar links to appear in one line.
- * Here's an alternate method: */
- /*
- #navbar li
- {
- display: inline;
- padding: 0 10px 0 0;
- }
- */
-
-/** sidebar-left **/
- #sidebar-left
- {
- float: left;
- width: 200px;
- margin-left: 0;
- margin-right: -200px; /* Negative value of #sidebar-left's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-left-inner. */
- }
-
- #sidebar-left-inner
- {
- margin: 0 20px 0 0;
- padding: 0;
- }
-
-/** sidebar-right **/
- #sidebar-right
- {
- float: right;
- width: 200px;
- margin-left: -200px; /* Negative value of #sidebar-right's width + right margin. */
- margin-right: 0;
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #sidebar-right-inner. */
- }
-
- #sidebar-right-inner
- {
- margin: 0 0 0 20px;
- padding: 0;
- }
-
-/** footer **/
- #footer
- {
- }
-
- #footer-inner
- {
- }
-
-/** closure **/
- #closure-blocks /* See also the #page declaration above that this div shares. */
- {
- }
-
-/** Prevent overflowing content **/
- #header,
- #content,
- #navbar,
- #sidebar-left,
- #sidebar-right,
- #footer,
- #closure-blocks
- {
- overflow: visible;
- word-wrap: break-word; /* A very nice CSS3 property */
- }
-
- #navbar
- {
- overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
- }
-
- /* If a div.clear-block doesn't have any content after it and its bottom edge
- touches the bottom of the viewport, Firefox and Safari will mistakenly
- place several pixels worth of space between the bottom of the div and the
- bottom of the viewport. Uncomment this CSS property to fix this.
- Note: with some over-large content, this property might cause scrollbars
- to appear on the #page div.
- */
- /*
- #page
- {
- overflow-y: hidden;
- }
- */
+/* converted from: layout-liquid.css,v 1.5.2.4 2009/02/13 19:30:50 johnalbin Exp $ */
+#page,
+#closure-blocks {
+ min-width: 960px;
+}
+
+#navigation-top,
+#navigation {
+ position: absolute;
+ left: -10000px;
+}
+
+#skip-to-nav {
+ float: right;
+ margin: 0 !important;
+ font-size: 0.8em;
+}
+#skip-to-nav a:link a:visited {
+ color: white;
+}
+#skip-to-nav a:hover {
+ color: black;
+ text-decoration: none;
+}
+
+#logo {
+ float: left;
+}
+
+#header-blocks {
+ clear: both;
+}
+
+#main {
+ position: relative;
+}
+
+#content {
+ float: left;
+ width: 100%;
+ margin-left: 0;
+ margin-right: -100%;
+ padding: 0;
+}
+
+#content-inner,
+.no-sidebars #content-inner {
+ margin: 0;
+ padding: 0;
+}
+
+.sidebar-left #content-inner {
+ padding-left: 200px;
+ padding-right: 0;
+}
+
+.sidebar-right #content-inner {
+ padding-left: 0;
+ padding-right: 200px;
+}
+
+.two-sidebars #content-inner {
+ padding-left: 200px;
+ padding-right: 200px;
+}
+
+#navbar {
+ float: left;
+ width: 100%;
+ margin-left: 0;
+ margin-right: -100%;
+ padding: 0;
+ height: 3.6em;
+}
+
+.with-navbar #content,
+.with-navbar #sidebar-left,
+.with-navbar #sidebar-right {
+ margin-top: 3.6em;
+}
+
+#search-box {
+ width: 200px;
+ margin-right: -200px;
+ float: left;
+}
+
+#primary {
+ margin-left: 200px;
+}
+
+#secondary {
+ margin-left: 200px;
+}
+
+#navbar ul {
+ margin: 0;
+ padding: 0;
+ text-align: left;
+}
+
+#navbar li {
+ float: left;
+ padding: 0 10px 0 0;
+}
+
+#sidebar-left {
+ float: left;
+ width: 200px;
+ margin-left: 0;
+ margin-right: -200px;
+ padding: 0;
+}
+
+#sidebar-left-inner {
+ margin: 0 20px 0 0;
+ padding: 0;
+}
+
+#sidebar-right {
+ float: left;
+ width: 200px;
+ margin-left: -200px;
+ margin-right: 0;
+ padding: 0;
+}
+
+#sidebar-right-inner {
+ margin: 0 0 0 20px;
+ padding: 0;
+}
+
+#header,
+#content,
+#navbar,
+#sidebar-left,
+#sidebar-right,
+#footer,
+#closure-blocks {
+ overflow: visible;
+ word-wrap: break-word;
+}
+
+#navbar {
+ overflow: hidden;
+}
=== modified file 'sites/all/themes/zen/zen/zen.css'
--- sites/all/themes/zen/zen/zen.css 2009-12-19 01:31:51 +0000
+++ sites/all/themes/zen/zen/zen.css 2010-09-14 13:41:08 +0000
@@ -1,772 +1,211 @@
-/* $Id: zen.css,v 1.14.2.6 2009/11/05 11:03:32 johnalbin Exp $ */
-
-/*
- * ZEN STYLES
- *
- * This is an example stylesheet. Sub-themes should NOT include the zen/zen.css
- * file, but instead copy this CSS to their own stylesheets.
- *
- * In this stylesheet, we have included all of the classes and IDs from this
- * theme's tpl.php files. We have also included many of the useful Drupal core
- * styles to make it easier for theme developers to see them.
- *
- * Many of these styles are over-riding Drupal's core stylesheets, so if you
- * remove a declaration from here, the styles may still not be what you want
- * since Drupal's core stylesheets are still styling the element. See the
- * drupal6-reference.css file for a list of all Drupal 5.x core styles.
- *
- * In addition to the style declarations in this file, other Drupal styles that
- * you might want to override or augment are those for:
- *
- * Book Navigation See line 74 of Zen's drupal6-reference.css file
- * Forum See line 197 of Zen's drupal6-reference.css file
- * Menus See line 667 of Zen's drupal6-reference.css file
- * News Aggregator See line 20 of Zen's drupal6-reference.css file
- * Polls See line 287 of Zen's drupal6-reference.css file
- * Search See line 320 of Zen's drupal6-reference.css file
- * User Profiles See line 945 of Zen's drupal6-reference.css file
- */
-
-
-/** body **/
- body
- {
- margin: 0;
- padding: 10px;
- }
-
- #page
- {
- }
-
- #page-inner
- {
- }
-
-/** header **/
- #header
- {
- }
-
- #header-inner
- {
- }
-
- #logo-title /* Wrapper for logo, website name, and slogan */
- {
- }
-
- #logo /* Wrapper for logo */
- {
- margin: 0 10px 0 0;
- padding: 0;
- }
-
- #logo-image /* The actual logo image */
- {
- }
-
- h1#site-name, div#site-name /* The name of the website */
- {
- margin: 0;
- font-size: 2em;
- line-height: 1.3em;
- }
-
- #site-name a:link,
- #site-name a:visited
- {
- color: #000;
- text-decoration: none;
- }
-
- #site-name a:hover
- {
- text-decoration: underline;
- }
-
- #site-slogan /* The slogan (or tagline) of a website */
- {
- }
-
- #header-blocks /* Wrapper for any blocks placed in the header region */
- {
- }
-
-/** main (container for everything else) **/
- #main
- {
- }
-
- #main-inner
- {
- }
-
-/** content **/
- #content
- {
- }
-
- #content-inner
- {
- }
-
- #mission /* The mission statement of the site (displayed on homepage) */
- {
- }
-
- #content-top /* Wrapper for any blocks placed in the "content top" region */
- {
- }
-
- #content-header /* Wrapper for breadcrumb, title, messages, tabs, and help */
- {
- }
-
- .breadcrumb /* The path to the current page in the form of a list of links */
- {
- padding-bottom: 0; /* Undo system.css */
- }
-
- h1.title, /* The title of the page */
- h2.title, /* Block title or the title of a piece of content when it is given in a list of content */
- h3.title /* Comment title */
- {
- margin: 0;
- }
-
- div.messages /* Important messages (status, warning, and error) for the user */
- {
- }
-
- div.status /* Normal priority messages */
- {
- }
-
- div.warning, tr.warning /* Medium priority messages */
- {
- /* border: 1px solid #f0c020; */ /* Drupal core uses: 1px solid #f0c020 */
- }
-
- div.error, tr.error /* High priority messages. See also the .error declaration below. */
- {
- }
-
- div.tabs /* See also the tabs.css file. */
- {
- }
-
- .help /* Help text on a page */
- {
- margin: 1em 0;
- }
-
- .more-help-link /* Link to more help */
- {
- font-size: 0.85em;
- text-align: right;
- }
-
- #content-area /* Wrapper for the actual page content */
- {
- }
-
- ul.links /* List of links */
- {
- margin: 1em 0;
- padding: 0;
- }
-
- ul.links.inline
- {
- margin: 0;
- display: inline;
- }
-
- ul.links li
- {
- display: inline;
- list-style-type: none;
- padding: 0 0.5em;
- }
-
- .pager /* A list of page numbers when more than 1 page of content is available */
- {
- clear: both;
- margin: 1em 0;
- text-align: center;
- }
-
- .pager a, .pager strong.pager-current
- {
- padding: 0.5em;
- }
-
- .feed-icons /* The links to the RSS or Atom feeds for the current list of content */
- {
- margin: 1em 0;
- }
-
- #content-bottom /* Wrapper for any blocks placed in the "content bottom" region */
- {
- }
-
-/** navbar **/
- #navbar
- {
- }
-
- #navbar-inner
- {
- }
-
- #search-box /* Wrapper for the search form */
- {
- }
-
- #edit-search-theme-form-1-wrapper label /* Label that says "Search this site:" */
- {
- display: none;
- }
-
- #primary /* Primary links */
- {
- }
-
- #secondary /* Secondary links */
- {
- }
-
-/** sidebar-left **/
- #sidebar-left
- {
- }
-
- #sidebar-left-inner
- {
- }
-
-/** sidebar-right **/
- #sidebar-right
- {
- }
-
- #sidebar-right-inner
- {
- }
-
-/** footer **/
- #footer
- {
- }
-
- #footer-inner
- {
- }
-
- #footer-message /* Wrapper for the footer message from Drupal's "Site information"
- and for any blocks placed in the footer region */
- {
- }
-
-/** closure **/
- #closure-blocks /* Wrapper for any blocks placed in the closure region */
- {
- }
-
-/** Drupal nodes **/
- .node /* Node wrapper */
- {
- }
-
- .node-inner /* Additional wrapper for node */
- {
- }
-
- .sticky /* A sticky node (displayed before others in a list) */
- {
- }
-
- .node-unpublished /* Unpublished nodes */
- {
- /* background-color: #fff4f4; */ /* Drupal core uses a #fff4f4 background */
- }
-
- .node-unpublished div.unpublished, /* The word "Unpublished" displayed beneath the content. */
- .comment-unpublished div.unpublished
- {
- height: 0;
- overflow: visible;
- color: #d8d8d8;
- font-size: 75px;
- line-height: 1;
- font-family: Impact, "Arial Narrow", Helvetica, sans-serif;
- font-weight: bold;
- text-transform: uppercase;
- text-align: center;
- word-wrap: break-word; /* A very nice CSS3 property */
- }
-
- .node-mine /* A node created by the current user */
- {
- }
-
- .node-teaser /* A node displayed as teaser */
- {
- }
-
- /* All nodes are given a node-type-FOO class that describes the type of
- * content that it is. If you create a new content type called
- * "my-custom-type", it will receive a "node-type-my-custom-type" class.
- */
- .node-type-page /* Page content node */
- {
- }
-
- .node-type-story /* Story content node */
- {
- }
-
- .node h2.title /* Node title */
- {
- }
-
- .marker /* "New" or "Updated" marker for content that is new or updated for the current user */
- {
- color: #c00;
- }
-
- .node .picture /* The picture of the node author */
- {
- }
-
- .node.node-unpublished .picture,
- .comment.comment-unpublished .picture
- {
- position: relative; /* Otherwise floated pictures will appear below the "Unpublished" text. */
- }
-
- .node .meta /* Wrapper for submitted and terms data */
- {
- }
-
- .node .submitted /* The "posted by" information */
- {
- }
-
- .node .terms /* Node terms (taxonomy) */
- {
- }
-
- .node .content /* Node's content wrapper */
- {
- }
-
- .node ul.links /* Node links. See also the ul.links declaration above. */
- {
- }
-
- .preview .node /* Preview of the content before submitting new or updated content */
- {
- /* background-color: #ffffea; */ /* Drupal core uses a #ffffea background */
- }
-
-/** Drupal comments **/
- #comments /* Wrapper for the list of comments and its title */
- {
- margin: 1em 0;
- }
-
- #comments-title /* Heading for the list of comments */
- {
- }
-
- .comment /* Wrapper for a single comment */
- {
- }
-
- .comment-inner /* Additional wrapper for a single comment */
- {
- }
-
- .comment-preview /* Preview of the comment before submitting new or updated comment */
- {
- }
-
- .comment.new /* A new comment since the user last viewed the page. */
- {
- }
-
- .comment.odd /* An odd-numbered comment in the list of comments */
- {
- }
-
- .comment.even /* An even-numbered comment in the list of comments */
- {
- }
-
- .comment.first /* The first comment in the list of comments */
- {
- }
-
- .comment.last /* The last comment in the list of comments */
- {
- }
-
- .comment-unpublished /* Unpublished comments */
- {
- /* background-color: #fff4f4; */ /* Drupal core uses a #fff4f4 background */
- }
-
- .comment-unpublished div.unpublished /* The word "Unpublished" displayed beneath the content. See also the div.unpublished declaration in the node section above. */
- {
- }
-
- .comment-published /* Published comments */
- {
- }
-
- .comment-by-anon /* A comment created by an anonymous user */
- {
- }
-
- .comment-by-author /* A comment created by the node's author */
- {
- }
-
- .comment-mine /* A comment created by the current user */
- {
- }
-
- .comment h3.title /* Comment title */
- {
- }
-
- .new /* "New" marker for comments that are new for the current user */
- {
- color: #c00;
- }
-
- .comment .picture /* The picture of the comment author */
- {
- }
-
- .comment .submitted /* The "posted by" information */
- {
- }
-
- .comment .content /* Comment's content wrapper */
- {
- }
-
- .comment .user-signature /* The user's signature */
- {
- }
-
- .comment ul.links /* Comment links. See also the ul.links declaration above. */
- {
- margin: 1em 0;
- }
-
- .indented /* Nested comments are indented */
- {
- /* margin-left: 25px; */ /* Drupal core uses a 25px left margin */
- }
-
- .preview .comment /* Preview of the comment before submitting new or updated comment */
- {
- /* background-color: #ffffea; */ /* Drupal core uses a #ffffea background */
- }
-
-/** Drupal blocks **/
- .block /* Block wrapper */
- {
- margin-bottom: 1em;
- }
-
- .block.region-odd /* Zebra striping for each block in the region */
- {
- }
-
- .block.region-even /* Zebra striping for each block in the region */
- {
- }
-
- .block.odd /* Zebra striping independent of each region */
- {
- }
-
- .block.even /* Zebra striping independent of each region */
- {
- }
-
- .region-count-1 /* Incremental count for each block in the region */
- {
- }
-
- .count-1 /* Incremental count independent of each region */
- {
- }
-
- .block-inner /* Additional wrapper for block */
- {
- }
-
- .block h2.title /* Block title */
- {
- }
-
- .block .content /* Block's content wrapper */
- {
- }
-
- #block-aggregator-category-1 /* Block for the latest news items in the first category */
- {
- }
-
- #block-aggregator-feed-1 /* Block for the latest news items in the first feed */
- {
- }
-
- #block-block-1 /* First administrator-defined block */
- {
- }
-
- #block-blog-0 /* "Recent blog posts" block */
- {
- }
-
- #block-book-0 /* "Book navigation" block for the current book's table of contents */
- {
- }
-
- #block-comment-0 /* "Recent comments" block */
- {
- }
-
- #block-forum-0 /* "Active forum topics" block */
- {
- }
-
- #block-forum-1 /* "New forum topics" block */
- {
- }
-
- #block-menu-primary-links /* "Primary links" block */
- {
- }
-
- #block-menu-secondary-links /* "Secondary links" block */
- {
- }
-
- #block-node-0 /* "Syndicate" block for primary RSS feed */
- {
- }
-
- #block-poll-0 /* "Most recent poll" block */
- {
- }
-
- #block-profile-0 /* "Author information" block for the profile of the page's author */
- {
- }
-
- #block-search-0 /* "Search form" block */
- {
- }
-
- #block-statistics-0 /* "Popular content" block */
- {
- }
-
- #block-user-0 /* "User login form" block */
- {
- }
-
- #block-user-1 /* "Navigation" block for Drupal navigation menu */
- {
- }
-
- #block-user-2 /* "Who's new" block for a list of the newest users */
- {
- }
-
- #block-user-3 /* "Who's online" block for a list of the online users */
- {
- }
-
-/** Drupal boxes **/
- /* Wrapper for Comment form, Comment viewing options, Menu admin, and
- * Search results.
- */
- .box /* Wrapper for box */
- {
- }
-
- .box-inner /* Additional wrapper for box */
- {
- }
-
- .box h2.title /* Box title */
- {
- }
-
- .box .content /* Box's content wrapper */
- {
- }
-
-/** Miscellaneous Drupal styles **/
- .error /* Errors that are separate from div.messages status messages (see above.) */
- {
- /* color: #e55; */ /* Drupal core uses a #e55 background */
- }
-
- .warning /* Warnings that are separate from div.messages status messages (see above.) */
- {
- /* color: #e09010; */ /* Drupal core uses a #e09010 background */
- }
-
- .more-link /* Aggregator, blog, and forum more link */
- {
- text-align: right;
- }
-
- #user-login-form /* Drupal's default login form */
- {
- text-align: left;
- }
-
- tr.even /* Some tables have rows marked even or odd. */
- {
- /* background-color: #eee; */ /* Drupal core uses a #eee background */
- }
-
- tr.odd
- {
- /* background-color: #eee; */ /* Drupal core uses a #eee background */
- }
-
- li a.active /* The active item in a Drupal menu */
- {
- color: #000;
- }
-
-
-/** Drupal forms **/
- .form-item, /* Wrapper for a form element (or group of form elements) and its label */
- .form-checkboxes,
- .form-radios
- {
- margin: 1em 0;
- }
-
- .form-item input.error, /* Highlight the form elements that caused a form submission error */
- .form-item textarea.error,
- .form-item select.error
- {
- border: 2px solid #c00;
- }
-
- .form-item label /* The label for a form element */
- {
- display: block;
- font-weight: bold;
- }
-
- .form-item label.option /* The label for a radio button or checkbox */
- {
- display: inline;
- font-weight: normal;
- }
-
- .form-required /* The part of the label that indicates a required field */
- {
- color: #c00;
- }
-
- .form-item .description /* The descriptive help text (separate from the label) */
- {
- font-size: 0.85em;
- }
-
- .form-checkboxes .form-item, /* Pack groups of checkboxes and radio buttons closer together */
- .form-radios .form-item
- {
- margin: 0.4em 0;
- }
-
- .form-submit /* The submit button */
- {
- }
-
- .container-inline div, .container-inline label /* Inline labels and form divs */
- {
- display: inline;
- }
-
- .tips /* Tips for Drupal's input formats */
- {
- margin: 0;
- padding: 0;
- font-size: 0.9em;
- }
-
-/** OpenID **/
- /* The default styling for the OpenID login link seems to assume Garland's
- * styling of list items.
- */
- #user-login-form ul /* OpenID creates a new ul above the login form's links. */
- {
- margin-bottom: 0; /* Position OpenID's ul next to the rest of the links. */
- }
-
- #user-login-form li.openid-link /* The "Log in using OpenID" links. */
- {
- margin-top: 1em;
- margin-left: -20px; /* Un-do some of the padding on the ul list. */
- }
-
- #user-login-form li.user-link /* The "Cancel OpenID login" links. */
- {
- margin-top: 1em;
- }
-
- #user-login ul
- {
- margin: 1em 0;
- }
-
- #user-login li.openid-link, /* The OpenID links on the /user form. */
- #user-login li.user-link
- {
- margin-left: -2em; /* Un-do all of the padding on the ul list. */
- }
-
-/** Drupal admin tables **/
- /* We overrode these styles in html-elements.css, but restore them for the
- * forms on the site.
- */
- form tbody
- {
- border-top: 1px solid #ccc;
- }
-
- form th
- {
- text-align: left;
- padding-right: 1em;
- border-bottom: 3px solid #ccc;
- }
-
- form tbody th
- {
- border-bottom: 1px solid #ccc;
- }
-
- form thead th
- {
- text-align: left;
- padding-right: 1em;
- border-bottom: 3px solid #ccc;
- }
+body {
+ margin: 0;
+ padding: 10px;
+}
+
+#logo {
+ margin: 0 10px 0 0;
+ padding: 0;
+}
+
+h1#site-name, div#site-name {
+ margin: 0;
+ font-size: 2em;
+ line-height: 1.3em;
+}
+
+#site-name a:link, #site-name a:visited {
+ color: black;
+ text-decoration: none;
+}
+#site-name a:hover {
+ text-decoration: underline;
+}
+
+.breadcrumb {
+ padding-bottom: 0;
+}
+
+h1.title,
+h2.title,
+h3.title {
+ margin: 0;
+}
+
+.help {
+ margin: 1em 0;
+}
+
+.more-help-link {
+ font-size: 0.85em;
+ text-align: right;
+}
+
+body.node-type-artiest #content-area {
+ padding-bottom: 2px;
+}
+
+ul.links {
+ margin: 1em 0;
+ padding: 0;
+}
+
+ul.links.inline {
+ margin: 0;
+ display: inline;
+}
+
+ul.links li {
+ display: inline;
+ list-style-type: none;
+ padding: 0 0.5em;
+}
+
+.pager {
+ clear: both;
+ margin: 1em 0;
+ text-align: center;
+}
+
+.pager a, .pager strong.pager-current {
+ padding: 0.5em;
+}
+
+.feed-icons {
+ margin: 1em 0;
+}
+
+#edit-search-theme-form-1-wrapper label {
+ display: none;
+}
+
+.node-unpublished div.unpublished,
+.comment-unpublished div.unpublished {
+ height: 0;
+ overflow: visible;
+ color: #d8d8d8;
+ font-size: 75px;
+ line-height: 1;
+ font-family: Impact, "Arial Narrow", Helvetica, sans-serif;
+ font-weight: bold;
+ text-transform: uppercase;
+ text-align: center;
+ word-wrap: break-word;
+}
+
+.marker {
+ color: #cc0000;
+}
+
+.node.node-unpublished .picture,
+.comment.comment-unpublished .picture {
+ position: relative;
+}
+
+#comments {
+ margin: 1em 0;
+}
+
+.new {
+ color: #cc0000;
+}
+
+.comment ul.links {
+ margin: 1em 0;
+}
+
+/* Drupal blocks */
+.block {
+ margin-bottom: 1em;
+}
+
+/* Drupal boxes */
+.more-link {
+ text-align: right;
+}
+
+#user-login-form {
+ text-align: left;
+}
+
+li a.active {
+ color: black;
+}
+
+.form-item,
+.form-checkboxes,
+.form-radios {
+ margin: 1em 0;
+}
+
+.form-item input.error,
+.form-item textarea.error,
+.form-item select.error {
+ border: 2px solid #cc0000;
+}
+.form-item label {
+ display: block;
+ font-weight: bold;
+}
+.form-item label.option {
+ display: inline;
+ font-weight: normal;
+}
+.form-item .description {
+ font-size: 0.85em;
+}
+
+.form-required {
+ color: #cc0000;
+}
+
+.form-checkboxes .form-item,
+.form-radios .form-item {
+ margin: 0.4em 0;
+}
+
+.container-inline div, .container-inline label {
+ display: inline;
+}
+
+.tips {
+ margin: 0;
+ padding: 0;
+ font-size: 0.9em;
+}
+
+#user-login-form ul {
+ margin-bottom: 0;
+}
+#user-login-form li.openid-link {
+ margin-top: 1em;
+ margin-left: -20px;
+}
+#user-login-form li.user-link {
+ margin-top: 1em;
+}
+
+#user-login ul {
+ margin: 1em 0;
+}
+#user-login li.openid-link,
+#user-login li.user-link {
+ margin-left: -2em;
+}
+
+form tbody {
+ border-top: 1px solid #cccccc;
+}
+form th {
+ text-align: left;
+ padding-right: 1em;
+ border-bottom: 3px solid #cccccc;
+}
+form tbody th {
+ border-bottom: 1px solid #cccccc;
+}
+form thead th {
+ text-align: left;
+ padding-right: 1em;
+ border-bottom: 3px solid #cccccc;
+}