Index: themes/chameleon/chameleon.info =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.info,v retrieving revision 1.5 diff -u -p -r1.5 chameleon.info --- themes/chameleon/chameleon.info 18 Feb 2008 19:19:48 -0000 1.5 +++ themes/chameleon/chameleon.info 10 Mar 2009 15:15:03 -0000 @@ -1,13 +0,0 @@ -; $Id: chameleon.info,v 1.5 2008/02/18 19:19:48 dries Exp $ -name = Chameleon -description = Minimalist tabled theme with light colors. -regions[left] = Left sidebar -regions[right] = Right sidebar -features[] = logo -features[] = favicon -features[] = name -features[] = slogan -stylesheets[all][] = style.css -stylesheets[all][] = common.css -version = VERSION -core = 7.x Index: themes/chameleon/chameleon.theme =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/chameleon.theme,v retrieving revision 1.89 diff -u -p -r1.89 chameleon.theme --- themes/chameleon/chameleon.theme 18 Feb 2009 14:28:24 -0000 1.89 +++ themes/chameleon/chameleon.theme 10 Mar 2009 15:15:03 -0000 @@ -1,190 +0,0 @@ -language; - $direction = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; - - if (theme_get_setting('toggle_favicon')) { - drupal_set_html_head(''); - } - - $title = drupal_get_title(); - $rdf_namespaces = drupal_get_rdf_namespaces(); - - // Get blocks before so that they can alter the header (JavaScript, Stylesheets etc.) - $blocks_left = theme_blocks('left'); - $blocks_right = theme_blocks('right'); - - $output = "\n"; - $output .= "\n"; - $output .= " " . ($title ? strip_tags($title) . " | " . variable_get("site_name", "Drupal") : variable_get("site_name", "Drupal") . " | " . variable_get("site_slogan", "")) . "\n"; - $output .= drupal_get_html_head(); - $output .= drupal_get_css(); - $output .= drupal_get_js(); - $output .= ""; - $output .= "\n"; - $output .= "
"; - - if ($logo = theme_get_setting('logo')) { - $output .= " \"""; - } - if (theme_get_setting('toggle_name')) { - $output .= "

" . l(variable_get('site_name', 'drupal'), "") . "

"; - } - if (theme_get_setting('toggle_slogan')) { - $output .= "
" . variable_get('site_slogan', '') . "
"; - } - - $output .= "
\n"; - - $main_menu = theme('links', menu_main_menu(), array('class' => 'links', 'id' => 'navlist')); - $secondary_menu = theme('links', menu_secondary_menu(), array('class' => 'links', 'id' => 'subnavlist')); - if (isset($main_menu) || isset($secondary_menu)) { - $output .= '
'; - if (isset($main_menu)) { - $output .= $main_menu; - } - if (isset($secondary_menu)) { - $output .= $secondary_menu; - } - $output .= "
\n"; - } - - $output .= " \n"; - $output .= " \n"; - - if ($show_blocks && !empty($blocks_left)) { - $output .= " \n"; - } - - $output .= " \n"; - - if ($show_blocks && !empty($blocks_right)) { - $output .= " \n"; - } - - $output .= " \n"; - $output .= "
$blocks_left\n"; - - if ($title) { - $output .= theme("breadcrumb", drupal_get_breadcrumb()); - $output .= "

$title

"; - } - - if ($tabs = theme('menu_local_tasks')) { - $output .= $tabs; - } - - if ($show_messages) { - $output .= theme('status_messages'); - } - - $output .= theme('help'); - - $output .= "\n\n"; - $output .= $content; - $output .= drupal_get_feeds(); - $output .= "\n\n"; - - if ($footer = variable_get('site_footer', '')) { - $output .= "
$footer
\n"; - } - - $output .= " 		$blocks_right
\n"; - - $output .= theme_closure(); - $output .= " \n"; - $output .= "\n"; - - return $output; -} - -function chameleon_node($node, $teaser = 0) { - - $output = "
status) ? ' node-unpublished' : '') . (($node->sticky) ? ' sticky' : '') . "\">\n"; - - if (!$page) { - $output .= "

" . ($teaser ? l($node->title, "node/$node->nid") : check_plain($node->title)) . "

\n"; - } - - $output .= "
\n"; - - if ($teaser && $node->teaser) { - $output .= $node->teaser; - } - elseif (isset($node->body)) { - $output .= $node->body; - } - - $output .= "
\n"; - - $submitted = ''; - if (variable_get('node_submitted_' . $node->type, TRUE)) { - $submitted = t("By !author at @date", array('!author' => theme('username', $node), '@date' => format_date($node->created, 'small'))); - } - - $terms = ''; - if (!empty($node->content['links']['terms'])) { - $terms = drupal_render($node->content['links']['terms']); - } - - $links = ''; - if ($node->content['links']) { - $links = drupal_render($node->content['links']); - } - - if (!empty($terms) || !empty($links)) { - $output .= '
' . $terms . $links . $submitted . "
\n"; - } - - $output .= "
\n"; - - if ($node->content['comments']) { - $output .= drupal_render($node->content['comments']); - } - - return $output; -} - -function chameleon_comment($comment, $node, $links = array()) { - $submitted['comment_submitted'] = array( - 'title' => t('By !author at @date', array('!author' => theme('username', $comment), '@date' => format_date($comment->timestamp, 'small'))), - 'html' => TRUE); - - $output = "
\n"; - $output .= "

" . l($comment->subject, $_GET['q'], array('fragment' => "comment-$comment->cid")) . "

\n"; - $output .= "
" . $comment->comment; - if (!empty($comment->signature)) { - $output .= "
"; - $output .= "
—
\n"; - $output .= $comment->signature . "\n"; - $output .= "
\n"; - } - $output .= "
\n"; - $output .= "
" . theme('links', array_merge($submitted, $links)) . "
\n"; - $output .= "
\n"; - - return $output; -} - -function chameleon_help() { - if ($help = menu_get_active_help()) { - return '
' . $help . '
'; - } -} - Index: themes/chameleon/common-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/common-rtl.css,v retrieving revision 1.2 diff -u -p -r1.2 common-rtl.css --- themes/chameleon/common-rtl.css 5 Jun 2007 09:15:02 -0000 1.2 +++ themes/chameleon/common-rtl.css 10 Mar 2009 15:15:03 -0000 @@ -1,19 +0,0 @@ -/* $Id: common-rtl.css,v 1.2 2007/06/05 09:15:02 dries Exp $ */ - -body { - direction: rtl; -} -.navlinks { - padding: 0em 0em 1.5em 0.5em; -} -.primary a { - padding: 0em 0em 0em 0.5em; -} -.secondary a { - padding: 0em 0em 0em 0.5em; -} - -#header img { - float: right; - padding: 0em 0em .5em 2em; -} Index: themes/chameleon/common.css =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/common.css,v retrieving revision 1.12 diff -u -p -r1.12 common.css --- themes/chameleon/common.css 4 Jun 2007 11:10:38 -0000 1.12 +++ themes/chameleon/common.css 10 Mar 2009 15:15:03 -0000 @@ -1,151 +0,0 @@ -/* $Id: common.css,v 1.12 2007/06/04 11:10:38 goba Exp $ */ - -/* -** HTML elements -*/ -a, a:link, a:active { - font-weight: bold; - text-decoration: none; -} -a:hover { - text-decoration: underline; -} -body { - margin: 0; - padding: 3em; - font-size: .9em; - line-height: 1.3em; -} -blockquote { - font-style: italic; -} -table { - margin: 0; - padding: .5em; - border-collapse: collapse; -} -code, pre { - font-size: 1em; -} -pre { - font-size: 0.8em; - padding: 1em; - background: #eee; -} -li { - padding-bottom: .3em; -} -h1, h2, h3, h4, h5, h6 { - margin-bottom: .25em; -} -h1 { - font-size: 1.3em; -} -h2 { - font-size: 1.2em; -} -h3 { - font-size: 1.1em; -} -h4, h5, h6 { - font-size: 1em; -} -p { - margin: 0 0 .5em 0; -} -br { - line-height: 0.6em; -} - -/* -** Page layout blocks / IDs -*/ -#header { - margin-bottom: 2em; -} -#help { - font-size: 0.8em; -} -#content { - clear: both; -} -#sidebar-left, #sidebar-right { - vertical-align: top; - padding: 10px; -} -#main { - padding-left: 1em; - padding-right: 1em; - vertical-align: top; -} -#footer { - font-size: 0.8em; - padding-top: 2em; - text-align: center; -} - -/* -** Common declarations for child classes of node, comment, block, box etc -*/ -.title { - margin: 0 0 .25em 0; -} -.content { - margin: 0 0 .5em 0; -} -ul.links.inline { - font-size: 0.8em; - line-height: 1.25em; -} -.block { - width: 180px; -} -.messages { - padding: 0.3em; - margin: 0.5em 0em 0.5em 0em; -} -.status { - border: 1px solid #3a3; - color: #3a3; -} -.error, form-item input.error { - border: 1px solid red; - color: red; -} - -/* -** Common navigation links added on the admin/build/themes/settings page -*/ -.navlinks { - padding: 0em 0.5em 1.5em 0em; /* LTR */ - clear: both; -} -.primary a { - font-size: 1.0em; - padding: 0em 0.5em 0em 0em; /* LTR */ -} -.secondary a { - font-size: 0.9em; - padding: 0em 0.5em 0em 0em; /* LTR */ -} - -/* -** Logo Image Positioning -*/ -#header img { - float: left; /* LTR */ - padding: 0em 2em .5em 0em; /* LTR */ -} -#header { - clear: both; -} -/* -** Module specific styles -*/ -.form-item textarea { - font-size: 1em; -} -#aggregator .feed-source { - border: 1px solid gray; - padding: 1em; -} Index: themes/chameleon/style-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/style-rtl.css,v retrieving revision 1.3 diff -u -p -r1.3 style-rtl.css --- themes/chameleon/style-rtl.css 27 Nov 2007 12:09:27 -0000 1.3 +++ themes/chameleon/style-rtl.css 10 Mar 2009 15:15:03 -0000 @@ -1,29 +0,0 @@ -/* $Id: style-rtl.css,v 1.3 2007/11/27 12:09:27 goba Exp $ */ - -body { - padding: 5em 3em 0 0; -} -/** - * Yes - right is on the left and left is on the right! - * Welcome to design by tables.. - */ -#sidebar-left { - border-right: none; - border-left: 1px solid gray; -} -#sidebar-right { - border-left: none; - border-right: 1px solid gray; -} - -ul.links li { - border-left: none; - border-right: 1px solid #000; -} -ul.links li.first { - border-left: none; - border-right: none; -} -div.links { - text-align: left; -} Index: themes/chameleon/marvin/marvin.info =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/marvin/marvin.info,v retrieving revision 1.5 diff -u -p -r1.5 marvin.info --- themes/chameleon/marvin/marvin.info 18 Feb 2008 19:19:48 -0000 1.5 +++ themes/chameleon/marvin/marvin.info 10 Mar 2009 15:15:03 -0000 @@ -1,8 +0,0 @@ -; $Id: marvin.info,v 1.5 2008/02/18 19:19:48 dries Exp $ -name = Marvin -description = Boxy tabled theme in all grays. -regions[left] = Left sidebar -regions[right] = Right sidebar -version = VERSION -core = 7.x -base theme = chameleon Index: themes/chameleon/marvin/style-rtl.css =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/marvin/style-rtl.css,v retrieving revision 1.2 diff -u -p -r1.2 style-rtl.css --- themes/chameleon/marvin/style-rtl.css 27 Nov 2007 12:09:27 -0000 1.2 +++ themes/chameleon/marvin/style-rtl.css 10 Mar 2009 15:15:03 -0000 @@ -1,33 +0,0 @@ -/* $Id: style-rtl.css,v 1.2 2007/11/27 12:09:27 goba Exp $ */ - -body { - background-image: url(druplicon-watermark-rtl.png); - background-position: top left; -} - -p { - margin: 0 0 1em 1em; -} - -ul.links li { - border-left: none; - border-right: 1px solid #888; -} - -/* -** Common declarations for child classes of node, comment, block, box etc -*/ -.node .submitted { - float: right; - padding: 0.5em 1em 0.5em 0; -} -.node .taxonomy { - float: left; -} -.node .content { - padding-left: 0; - padding-right: 1em; -} -.node .links { - padding: 1em 0.2em 1em 0; -} Index: themes/chameleon/marvin/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/chameleon/marvin/style.css,v retrieving revision 1.8 diff -u -p -r1.8 style.css --- themes/chameleon/marvin/style.css 4 Jun 2007 11:10:38 -0000 1.8 +++ themes/chameleon/marvin/style.css 10 Mar 2009 15:15:03 -0000 @@ -1,124 +0,0 @@ -/* $Id: style.css,v 1.8 2007/06/04 11:10:38 goba Exp $ */ - -/* -** HTML elements -*/ -body { - background: #fff url(druplicon-watermark.png) no-repeat top right; /* LTR */ - font-family: arial, helvetica, sans-serif; -} -a:link { - color: #656 -} -a:visited { - color: #656 -} -a:active { - color: #ccc -} -h2 { - background-color: #eaeaea; - border: solid 1px #777; - font-size: 1.1em; - margin: 0.5em 0em 0.5em 0em; - padding: 0.5em; -} -h2.title { - background-color: #fff; - border: solid 1px #888; - margin-top: 1em; -} -p { - margin: 0 1em 1em 0; /* LTR */ - padding: 0; -} -table { - font-size: 1em; -} - -/* -** Page layout blocks / IDs -*/ -#main { - width: 80%; -} -#header .title { - padding-top: .75em; -} -#subnavlist { - font-size: 0.8em; -} -ul.links li { - border-left: 1px solid #888; /* LTR */ -} -ul.links li.first { - border: none; -} - -/* -** Common declarations for child classes of node, comment, block, box etc -*/ -.node .submitted { - color: #7c7c7c; - font-size: 0.9em; - float: left; /* LTR */ - padding: 0.5em 0em 0.5em 1em; /* LTR */ -} -.node .taxonomy { - color: #7c7c7c; - font-size: 0.9em; - float: right; /* LTR */ -} -.node .content { - clear: both; - padding-left: 1em; /* LTR */ -} -.node .links { - padding: 1em 0 1em 0.2em; /* LTR */ -} -.comment { - border: solid 1px #777; - margin: 0.5em 0; - padding: 0.5em; -} -.block { - margin-bottom: 10px; - font-size: 0.9em; -} -.block .content { - border: solid 1px #888; - border-top: none; - margin: 0; - padding: 5px; -} -.block h2.title { - margin: 0; -} - -/* -** Administration page styles -*/ -div.admin-panel .description { - color: #999; -} - -div.admin-panel .body { - background: #f4f4f4; -} - -div.admin-panel h3 { - background-color: #888; - color: #fff; - padding: 5px 8px 5px; - margin: 0; -} - -/* -** Module specific styles -*/ -.item-list ul li { - list-style-image: url(bullet.png); -} -.path, .path a, .path a:visited { - color: #888; -}