diff -uprN themes/bluemarine/bluemarine.info themes/bluemarineNew/bluemarine.info --- themes/bluemarine/bluemarine.info 2007-12-13 13:05:59.000000000 -0200 +++ themes/bluemarineNew/bluemarine.info 2007-12-13 16:38:18.000000000 -0200 @@ -1,6 +1,6 @@ ; $Id: bluemarine.info,v 1.4 2007/06/08 05:50:57 dries Exp $ name = Bluemarine -description = Table-based multi-column theme with a marine and ash color scheme. +description = Table-based multi-column recolorable theme. version = VERSION core = 6.x engine = phptemplate Arquivos binários themes/bluemarine/color/base.png e themes/bluemarineNew/color/base.png diferem diff -uprN themes/bluemarine/color/color.inc themes/bluemarineNew/color/color.inc --- themes/bluemarine/color/color.inc 1969-12-31 21:00:00.000000000 -0300 +++ themes/bluemarineNew/color/color.inc 2007-12-13 16:37:46.000000000 -0200 @@ -0,0 +1,44 @@ + array( + '#6699cc,#336699,#dddddd,#eeeeee,#000000' => t('Bluemarine (Default)'), + '#000000,#666666,#cccccc,#dddddd,#222222' => t('Simple Black'), + '#880000,#880000,#cccccc,#eeeeee,#333333' => t('Simple Red'), + '#00aa00,#008800,#66dd66,#88ff88,#000000' => t('Simple Green'), + ), + + // Color areas to fill (x, y, width, height) + 'fill' => array( + 'base' => array(0, 0, 840, 55), + 'top' => array(0, 55, 214, 395), + 'bottom' => array(0, 450, 840, 50), + ), + + // Coordinates of all the theme slices (x, y, width, height) + // with their filename as used in the stylesheet. + 'slices' => array( + 'logo.png' => array(17, 1, 46, 53), + 'screenshot.png' => array(0, 0, 400, 240), + ), + + // Reference color used for blending. Matches the base.png's colors. + 'blend_target' => '#ffffff', + + // Preview files + 'preview_image' => 'color/preview.png', + 'preview_css' => 'color/preview.css', + + // Base file for image generation + 'base_image' => 'color/base.png', + + // Names for Color Module + 'names' => array( + 'base' => t('Header'), + 'link' => t('Link'), + 'top' => t('Sidebar'), + 'bottom' => t('Footer'), + 'text' => t('Text color'), + ), +); diff -uprN themes/bluemarine/color/preview.css themes/bluemarineNew/color/preview.css --- themes/bluemarine/color/preview.css 1969-12-31 21:00:00.000000000 -0300 +++ themes/bluemarineNew/color/preview.css 2007-12-13 16:37:46.000000000 -0200 @@ -0,0 +1,54 @@ +/* Positioning */ +#preview { + overflow: hidden; + max-width: 100%; +} +#preview #gradient { + position: absolute; + left: 0; + right: 0; + top: 55px; + height: 245px; + z-index: 2; +} +#preview, #preview #img { + width: 600px; + height: 300px; +} +#preview #text { + position: absolute; + left: 230px; + width: 350px; + top: 71px; + height: 216px; + z-index: 4; +} +#preview #img { + position: relative; + z-index: 3; +} +#preview #gradient .gradient-line { + height: 245px; + overflow: hidden; +} + +/* Basic styles to match */ +#preview { + font: 12/76% Verdana; +} +#preview h2 { + margin: 0; + margin-bottom:0.5em + padding: 0; + font-size: 1.2em; +} +#preview p { + margin: .5em 0; +} +#preview a:link, #preview a:visited { + text-decoration: none; + font-weight: bold; +} +#preview a:hover { + text-decoration: underline; +} Arquivos binários themes/bluemarine/color/preview.png e themes/bluemarineNew/color/preview.png diferem diff -uprN themes/bluemarine/CVS/Entries themes/bluemarineNew/CVS/Entries --- themes/bluemarine/CVS/Entries 2007-12-13 16:36:43.000000000 -0200 +++ themes/bluemarineNew/CVS/Entries 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -D diff -uprN themes/bluemarine/CVS/Repository themes/bluemarineNew/CVS/Repository --- themes/bluemarine/CVS/Repository 2007-12-13 16:36:43.000000000 -0200 +++ themes/bluemarineNew/CVS/Repository 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -drupal/themes/bluemarine diff -uprN themes/bluemarine/CVS/Root themes/bluemarineNew/CVS/Root --- themes/bluemarine/CVS/Root 2007-12-13 16:36:43.000000000 -0200 +++ themes/bluemarineNew/CVS/Root 1969-12-31 21:00:00.000000000 -0300 @@ -1 +0,0 @@ -:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal Arquivos binários themes/bluemarine/logo.png e themes/bluemarineNew/logo.png diferem diff -uprN themes/bluemarine/style.css themes/bluemarineNew/style.css --- themes/bluemarine/style.css 2007-12-13 13:05:59.000000000 -0200 +++ themes/bluemarineNew/style.css 2007-12-13 16:37:46.000000000 -0200 @@ -6,8 +6,8 @@ body { margin: 0; padding: 0; - color: #000; - background-color: #fff; + color: #000000; + background-color: #ffffff; font: 76% Verdana, Arial, Helvetica, sans-serif; } tr.odd td, tr.even td { @@ -34,23 +34,23 @@ a { font-weight: bold; } a:link { - color: #39c; + color: #3399cc; } a:visited { - color: #369; + color: #336699; } a:hover { - color: #39c; + color: #3399cc; text-decoration: underline; } fieldset { - border: 1px solid #ccc; + border: 1px solid #cccccc; } pre { - background-color: #eee; + background-color: #eeeeee; padding: 0.75em 1.5em; font-size: 12px; - border: 1px solid #ddd; + border: 1px solid #dddddd; } table { /* make sizes relative to body size! */ @@ -58,11 +58,11 @@ table { } .form-item label { font-size: 1em; - color: #222; + color: #222222; } .item-list .title { font-size: 1em; - color: #222; + color: #222222; } .links { margin-bottom: 0; @@ -83,6 +83,7 @@ table { #logo { vertical-align: middle; border: 0; + padding-bottom:1px; } #logo img { float: left; /* LTR */ @@ -97,29 +98,29 @@ table { #navlist { font-size: 1.0em; padding: 0 0.8em 1.2em 0; /* LTR */ - color: #9cf; + color: #99ccff; } #navlist a { font-weight: bold; - color: #fff; + color: #ffffff; } #subnavlist { padding: 0.5em 1.2em 0.4em 0; /* LTR */ font-size: 0.8em; - color: #9cf; + color: #99ccff; } #subnavlist a { font-weight: bold; - color: #9cf; + color: #99ccff; } ul.links li { - border-left: 1px solid #9cf; /* LTR */ + border-left: 1px solid #99ccff; /* LTR */ } ul.links li.first { border: none; } #search .form-text, #search .form-submit { - border: 1px solid #369; + border: 1px solid #336699; font-size: 1.1em; height: 1.5em; vertical-align: middle; @@ -129,12 +130,12 @@ ul.links li.first { padding: 0 0.5em; } #mission { - background-color: #369; + background-color: #336699; padding: 1.5em 2em; - color: #fff; + color: #ffffff; } #mission a, #mission a:visited { - color: #9cf; + color: #99ccff; font-weight: bold; } .site-name { @@ -143,15 +144,15 @@ ul.links li.first { font-size: 2em; } .site-name a:link, .site-name a:visited { - color: #fff; + color: #ffffff; } .site-name a:hover { - color: #369; + color: #336699; text-decoration: none; } .site-slogan { font-size: 1em; - color: #eee; + color: #eeeeee; display: block; margin: 0; font-style: italic; @@ -172,8 +173,8 @@ ul.links li.first { margin-bottom: .5em; } .messages { - background-color: #eee; - border: 1px solid #ccc; + background-color: #eeeeee; + border: 1px solid #cccccc; padding: 0.3em; margin-bottom: 1em; } @@ -181,14 +182,14 @@ ul.links li.first { border-color: red; } #sidebar-left, #sidebar-right { - background-color: #ddd; + background-color: #dddddd; width: 16em; /* padding in px not ex because IE messes up 100% width tables otherwise */ padding: 10px; vertical-align: top; } #footer { - background-color: #eee; + background-color: #eeeeee; padding: 1em; font-size: 0.8em; } @@ -202,15 +203,15 @@ ul.links li.first { .title, .title a { font-weight: bold; font-size: 1.3em; - color: #777; + color: #777777; margin: 0 auto; /* decrease default margins for h.title */ } .submitted { - color: #999; + color: #999999; font-size: 0.8em; } .links { - color: #999; + color: #999999; } .links a { font-weight: bold; @@ -219,7 +220,7 @@ ul.links li.first { padding: 0 0 1.5em 0; /* LTR */ } .block { - border-bottom: 1px solid #bbb; + border-bottom: 1px solid #bbbbbb; padding-bottom: 0.75em; margin-bottom: 1.5em; } @@ -234,8 +235,8 @@ ul.links li.first { } .sticky { padding: .5em; - background-color: #eee; - border: solid 1px #ddd; + background-color: #eeeeee; + border: solid 1px #dddddd; } .node .content, .comment .content { margin: .5em 0 .5em; @@ -246,12 +247,12 @@ ul.links li.first { padding-left: 1.5em; /* LTR */ } .node .picture { - border: 1px solid #ddd; + border: 1px solid #dddddd; float: right; /* LTR */ margin: 0.5em; } .comment { - border: 1px solid #abc; + border: 1px solid #aabbcc; padding: .5em; margin-bottom: 1em; } @@ -267,7 +268,7 @@ ul.links li.first { color: red; } .comment .picture { - border: 1px solid #abc; + border: 1px solid #aabbcc; float: right; /* LTR */ margin: 0.5em; } @@ -276,13 +277,13 @@ ul.links li.first { ** Module specific styles */ #aggregator .feed-source { - background-color: #eee; - border: 1px solid #ccc; + background-color: #eeeeee; + border: 1px solid #cccccc; padding: 1em; margin: 1em 0; } #aggregator .news-item .categories, #aggregator .source, #aggregator .age { - color: #999; + color: #999999; font-style: italic; font-size: 0.9em; } @@ -300,23 +301,23 @@ ul.links li.first { padding: 0.5em; } #forum td.forum, #forum td.posts { - background-color: #eee; + background-color: #eeeeee; } #forum td.topics, #forum td.last-reply { - background-color: #ddd; + background-color: #dddddd; } #forum td.container { - background-color: #ccc; + background-color: #cccccc; } #forum td.container a { - color: #555; + color: #555555; } #forum td.statistics, #forum td.settings, #forum td.pager { height: 1.5em; - border: 1px solid #bbb; + border: 1px solid #bbbbbb; } #forum td .name { - color: #96c; + color: #9966cc; } #forum td .links { padding-top: 0.7em; @@ -324,7 +325,7 @@ ul.links li.first { } #profile .profile { clear: both; - border: 1px solid #abc; + border: 1px solid #aabbcc; padding: .5em; margin: 1em 0em; } @@ -335,14 +336,17 @@ ul.links li.first { margin-bottom: .5em; } div.admin-panel .description { - color: #999; + color: #999999; } div.admin-panel .body { background: #f4f4f4; } div.admin-panel h3 { - background-color: #69c; - color: #fff; + background-color: #6699cc; + color: #ffffff; padding: 5px 8px 5px; margin: 0; } +/* + * Color Module: Don't touch + */ diff -uprN themes/bluemarine/template.php themes/bluemarineNew/template.php --- themes/bluemarine/template.php 1969-12-31 21:00:00.000000000 -0300 +++ themes/bluemarineNew/template.php 2007-12-13 16:37:46.000000000 -0200 @@ -0,0 +1,11 @@ +