diff U3 block.tpl.php block.tpl.php --- block.tpl.php Fri Apr 15 21:27:51 2005 +++ block.tpl.php Fri Apr 15 22:27:52 2005 @@ -1,4 +1,4 @@ -
module" ?>" id="module-$block->delta"; ?>"> -

subject ?>

-
content ?>
+
module" ?>" id="module-$block->delta"; ?>"> +

subject ?>

+
content ?>
\ No newline at end of file diff U3 comment.tpl.php comment.tpl.php --- comment.tpl.php Fri Apr 15 21:27:51 2005 +++ comment.tpl.php Fri Apr 15 22:27:52 2005 @@ -1,12 +1,12 @@ -
- new) : ?> - - -
said,

-

- - -
- -

»

+
+ new) : ?> + + +
said,

+

+ + +
+ +

»

\ No newline at end of file diff U3 node.tpl.php node.tpl.php --- node.tpl.php Fri Apr 15 21:27:51 2005 +++ node.tpl.php Fri Apr 15 22:27:52 2005 @@ -1,10 +1,10 @@ -
"> - -

- -
Posted in by on
-
- -

- +
"> + +

+ +
Posted in by on
+
+ +

+
\ No newline at end of file diff U3 page.tpl.php page.tpl.php --- page.tpl.php Fri May 20 21:36:27 2005 +++ page.tpl.php Tue Aug 01 22:26:56 2006 @@ -1,102 +1,99 @@ - - - -<?php print $head_title ?> - - - -> - -
- -
- -

-
- -
- -
-
-
- -
- - - -
- -
-
- -
- - -
- - -

- - - - - -

- - - - -
- - -
- - -
- - - - -
-
-
-
-
- - + + + +<?php print $head_title ?> + + + +> + +
+ +
+ +

+
+ +
+ +
+
+
+ +
+ + + +
+ +
+
+ +
+ + +
+ + +

+ + + + + +

+ + + + +
+ + +
+ + +
+ + + + +
+
+
+
+
+ + \ No newline at end of file diff U3 style.css style.css --- style.css Fri Apr 15 21:27:51 2005 +++ style.css Tue Aug 01 22:24:40 2006 @@ -1,492 +1,495 @@ -/* -Theme Name: Green Marinee -Theme URI: http://e-lusion.com/ -Description: Green Marinee was designed and built specially for Alex King's WordPress 1.5 themes competition. -Version: 1.0 -Author: Ian Main - -For the WordPress community (GPL), enjoy it guys. -by Ian Main - e-lusion.com - -Ported to Drupal by Jarrod Piccioni of GoodBasic (http://goodbasic.com) -*/ - -/* - - 1) General selectors - body,h1/h3,a,blockquote,code,p - 2) Structure - container,content,tagline - 3) Left selectors - main,meta,comments - 4) Right selectors - author,links,line,search,themes - 5) Footer - extras - 6) Forms - input,textarea - 7) Accessibility - skip,hr - 8) Hacks - clearfix - -*/ - -/* 1) -=-=-=- General selectors -=-=-=- */ - -body { - background: #FCFEF4 url(bg_top.gif) repeat-x; - margin: 68px 0 20px 0; - font-family: Arial, Verdana, Helvetica; - font-size: 76%; - color: #3F3F3F; - text-align: center; - } - -/*h1 { - color: #FCFEF4; - margin: -35px 0 0 7px; - position: absolute; - font-size: 2.2em; - }*/ - -h1 { - color: #FCFEF4; - margin: -45px 0 0 7px; - position: absolute; - font-size: 2.2em; - } - -h1 a:link, h1 a:visited { - color: #FCFEF4; - text-decoration: none; - } - -h1 a:hover, h1 a:active { - background: none; - color: #DAED9C; - text-decoration: none; - } - -h2 { - color: #7DA721; - font-weight: normal; - font-size: 1.8em; - margin: 20px 0 0 0; - } - -h2 a:link, h2 a:visited { - color: #7DA721; - font-weight: normal; - text-decoration: none; - } - -h2 a:hover, h2 a:active { - color: #3F3F3F; - background: none; - font-weight: normal; - text-decoration: none; - } - -h3 { - font-size: 1.4em; - margin: 20px 0 -10px 0; - font-weight: normal; - } - -a:link { - color: #78A515; - font-weight: bold; - text-decoration: none; - } - -a:visited { - color: #999; - } - -a:hover, a:active { - background: #78A515; - color: #fff; - text-decoration: none; - } - -blockquote { - border-left: 4px solid #3F3F3F; - padding: 0 10px; - margin: 0 0 0 10px; - font-style: italic; - } - -code { - display: block; - padding: 10px; - color: #444E1F; - background: #F5F8E8; - font-size: 1.2em; - border-top: 2px solid #D0EC98; - } - -p { - line-height: 1.4; - } - -/* 2)-=-=-=- Structure -=-=-=- */ - -#container { - width: 765px; - margin: 0 auto; - text-align: left; - } - -.container_left { - background: url(container_left.gif) no-repeat; - } - -.container_right { - background: url(container_right.gif) no-repeat top right; - } - -.topline { - background: url(container_top.gif) no-repeat; - } - -#content { - padding-top: 30px; - margin: 20px; - width: 480px; - } - -#content_bg { - background: #fff url(container.gif) repeat-y; - } - -.tagline { - color: #888; - margin: -18px 0 0 9px; - position: absolute; - font-size: 1em; - } - -/* 3)-=-=-=- Left selectors -=-=-=- */ - -.main li { - background: url(content_bullet.gif) no-repeat 0 7px; - padding: 2px 0 0 10px; - list-style: none; - } - -.main ul { - padding: 5px 0 20px 10px; - margin: 0; - } - -.main img { - padding: 3px; - border: 1px solid #ACE149; - } - -.meta { - background: #F5F5F5; - font-size: .9em; - padding: 2px; - } - -.meta:hover { - background: #F7FEDC; - } - -.highlight { /* Basic highlight for text */ - background: #F7FEDC; - } - -.comments { - font-size: 1.2em; - padding-bottom: 25px; - border-bottom: 3px double #eee; - } - -.comments a:link, .comments a:visited { - color: #78A515; - font-weight: bold; - text-decoration: none; - } - -.comments a:hover, .comments a:active { - background: #78A515; - color: #fff; - text-decoration: none; - } - -.alt { - background: #EAF8CF !important; - border: 1px solid #D5F0A4 !important; - padding: 10px 10px 0 10px !important; - } - -.alt:hover { - border: 1px solid #ACE149 !important; - } - -.comment:hover { - border: 1px solid #ACE149; - } - -.comment { - padding: 10px 10px 0 10px; - background: #F6FCEB; - border: 1px solid #DEF3B6; - margin: 10px; - color: #3C452D; - } - -p.metadate { - font-size: .8em; - margin: 0; - text-transform: uppercase; - } - -p.comment_meta { - margin: 0 0 10px 10px; - font-size: .9em; - } - -.comment_author a:visited { - font-weight: bold; - text-decoration: none; - } - -.reply { - font-weight: bold; - font-size: 1.2em; - margin: 10px 0 0 10px; - } - -.warning p { /* Used on the search page (image will appear if no result is found) */ - background: url(warning.gif) no-repeat left; - height: 160px; - padding: 20px 0 0 90px; - font-size: 1.5em; - margin: 0 0 0 10px; - } - -.postinput { - margin-left: 10px; - } - -/* 4)-=-=-=- Right selectors -=-=-=- */ - -#right { - float: right; - width: 250px; - padding: 10px 15px; - - /* Box model hack used for IE5.5/5 */ - voice-family: "\"}\""; - voice-family: inherit; - width: 230px; - } - -#right li { - list-style: none; - background: url(links_bullet.gif) 0 50% no-repeat; - padding: 2px 0 2px 20px; - } - -#right ul { - padding: 10px 10px 10px 0px; - margin: 0; - } - -#right a { - font-size: .9em; - text-decoration: none; - } - -#right a:link { - color: #565D4A; - font-weight: normal; - } - -#right a:visited { - color: #aaa; - } - -#right a:hover, #right a:active { - background: #80BE14; - color: #fff; - } - -.line, .block { - border-top: 3px solid #ACE149; - /*margin-top: -5px;*/ - } - -#search { - background: url(search.gif) no-repeat; - height: 56px; - margin: 0 auto; - padding-top: 22px; - } - -#right .block-nav { - border-top: 0 !important; - } - -#right h3 { - visibility: none; height: 1px; padding: 0; margin: 0; - } - -#right h2 { - font-size: 1.4em; - margin: 20px 0 0 0; - font-weight: normal; - color: #000; - } - -p.searchinfo { - margin: -8px 0 -8px 2px; - font-size: .9em; - color: #999; - } - -.searchfield { - background: #fff; - border: 1px solid #ACE149; - color: #7DA721; - padding: 2px 5px 1px 5px; - width: 160px; - } - -.searchfield:hover { - border: 1px solid #BFBFBF; - color: #949494; - } - -.submit { - background: url(search_submit.gif) no-repeat; - height: 20px; - width: 52px; - border: 0; - margin-left: 2px; - text-indent: -9999px; - cursor: pointer; - } - -.submit:hover { - background: url(search_submit.gif) no-repeat 0 -20px; - height: 20px; - width: 52px; - border: 0; - margin-left: 2px; - cursor: pointer; - } - -.themes { - font-size: .9em; - } - -#right img { - margin: 10px 0 20px 20px; -} - -#right .menu li, #right .block-nav li { - background: url(content_bullet.gif) no-repeat 0 7px; - padding: 2px 0 0 10px; - list-style: none; -} - -/* 5)-=-=-=- Footer -=-=-=- */ - -#footer { - background: url(footer.gif) no-repeat; - height: 75px; - } - -#footer p { - padding: 30px 0 0 70px; - float: left; - text-transform: uppercase; - font-size: .9em; - color: #777; - } - -.extras { - float: right; - padding: 33px 18px 0 0; - } - -.extras a { - text-decoration: none; - font-weight: bold; - } - -.extras a:link, .extras a:visited { - background: #ccc; - color: #fff; - padding: 5px; - border: 2px solid #fff; - } - -.extras a:hover, .extras a:active { - background: #DEEEA4; - color: #7AB90C; - padding: 5px; - border: 2px solid #C9E979; - } - -.extras li { - display: inline; - } - -.extras ul { - padding: 0 0 10px 0; - margin: 0; - } - -/* 6)-=-=-=- Forms -=-=-=- */ - -input { - border: 1px solid #BFBFBF; - color: #949494; - background: #fff; - padding: 2px 5px 1px 5px; - font-size: 1em; - } - -input:hover { - background: #fff; - border: 1px solid #ACE149; - color: #7DA721; - font-size: 1em; - } - -textarea { - font-family: Arial, Verdana, Helvetica; - font-size: 1.1em; - border: 1px solid #BFBFBF; - color: #949494; - padding: 2px 5px 1px 5px; - width: 450px; - } - -textarea:hover { - background: #fff; - border: 1px solid #ACE149; - color: #7DA721; - } - -/* 7)-=-=-=- Accessibility -=-=-=- */ - -#skip { - display: none; - } - -hr { /* Simple style when CSS not in use */ - display: none; - } - -/* 8)-=-=-=- Hacks -=-=-=- */ - -.clearfix:after { /* float hack used to float content correctly */ - content: "."; - display: block; - height: 0; - clear: both; - visibility: hidden; - } - -/* Hides from IE-mac \*/ -* html .clearfix {height: 1%;} +/* +Theme Name: Green Marinee +Theme URI: http://e-lusion.com/ +Description: Green Marinee was designed and built specially for Alex King's WordPress 1.5 themes competition. +Version: 1.0 +Author: Ian Main + +For the WordPress community (GPL), enjoy it guys. +by Ian Main - e-lusion.com + +Ported to Drupal by Jarrod Piccioni of GoodBasic (http://goodbasic.com) + +Migration to Drupal 4.7 by Thierry Guégan (http://www.arvoriad.com/) + +*/ + +/* + + 1) General selectors - body,h1/h3,a,blockquote,code,p + 2) Structure - container,content,tagline + 3) Left selectors - main,meta,comments + 4) Right selectors - author,links,line,search,themes + 5) Footer - extras + 6) Forms - input,textarea + 7) Accessibility - skip,hr + 8) Hacks - clearfix + +*/ + +/* 1) -=-=-=- General selectors -=-=-=- */ + +body { + background: #FCFEF4 url(bg_top.gif) repeat-x; + margin: 68px 0 20px 0; + font-family: Arial, Verdana, Helvetica; + font-size: 76%; + color: #3F3F3F; + text-align: center; + } + +/*h1 { + color: #FCFEF4; + margin: -35px 0 0 7px; + position: absolute; + font-size: 2.2em; + }*/ + +h1 { + color: #FCFEF4; + margin: -45px 0 0 7px; + position: absolute; + font-size: 2.2em; + } + +h1 a:link, h1 a:visited { + color: #FCFEF4; + text-decoration: none; + } + +h1 a:hover, h1 a:active { + background: none; + color: #DAED9C; + text-decoration: none; + } + +h2 { + color: #7DA721; + font-weight: normal; + font-size: 1.8em; + margin: 20px 0 0 0; + } + +h2 a:link, h2 a:visited { + color: #7DA721; + font-weight: normal; + text-decoration: none; + } + +h2 a:hover, h2 a:active { + color: #3F3F3F; + background: none; + font-weight: normal; + text-decoration: none; + } + +h3 { + font-size: 1.4em; + margin: 20px 0 -10px 0; + font-weight: normal; + } + +a:link { + color: #78A515; + font-weight: bold; + text-decoration: none; + } + +a:visited { + color: #999; + } + +a:hover, a:active { + background: #78A515; + color: #fff; + text-decoration: none; + } + +blockquote { + border-left: 4px solid #3F3F3F; + padding: 0 10px; + margin: 0 0 0 10px; + font-style: italic; + } + +code { + display: block; + padding: 10px; + color: #444E1F; + background: #F5F8E8; + font-size: 1.2em; + border-top: 2px solid #D0EC98; + } + +p { + line-height: 1.4; + } + +/* 2)-=-=-=- Structure -=-=-=- */ + +#container { + width: 765px; + margin: 0 auto; + text-align: left; + } + +.container_left { + background: url(container_left.gif) no-repeat; + } + +.container_right { + background: url(container_right.gif) no-repeat top right; + } + +.topline { + background: url(container_top.gif) no-repeat; + } + +#content { + padding-top: 30px; + margin: 20px; + width: 480px; + } + +#content_bg { + background: #fff url(container.gif) repeat-y; + } + +.tagline { + color: #888; + margin: -18px 0 0 9px; + position: absolute; + font-size: 1em; + } + +/* 3)-=-=-=- Left selectors -=-=-=- */ + +.main li { + background: url(content_bullet.gif) no-repeat 0 7px; + padding: 2px 0 0 10px; + list-style: none; + } + +.main ul { + padding: 5px 0 20px 10px; + margin: 0; + } + +.main img { + padding: 3px; + border: 1px solid #ACE149; + } + +.meta { + background: #F5F5F5; + font-size: .9em; + padding: 2px; + } + +.meta:hover { + background: #F7FEDC; + } + +.highlight { /* Basic highlight for text */ + background: #F7FEDC; + } + +.comments { + font-size: 1.2em; + padding-bottom: 25px; + border-bottom: 3px double #eee; + } + +.comments a:link, .comments a:visited { + color: #78A515; + font-weight: bold; + text-decoration: none; + } + +.comments a:hover, .comments a:active { + background: #78A515; + color: #fff; + text-decoration: none; + } + +.alt { + background: #EAF8CF !important; + border: 1px solid #D5F0A4 !important; + padding: 10px 10px 0 10px !important; + } + +.alt:hover { + border: 1px solid #ACE149 !important; + } + +.comment:hover { + border: 1px solid #ACE149; + } + +.comment { + padding: 10px 10px 0 10px; + background: #F6FCEB; + border: 1px solid #DEF3B6; + margin: 10px; + color: #3C452D; + } + +p.metadate { + font-size: .8em; + margin: 0; + text-transform: uppercase; + } + +p.comment_meta { + margin: 0 0 10px 10px; + font-size: .9em; + } + +.comment_author a:visited { + font-weight: bold; + text-decoration: none; + } + +.reply { + font-weight: bold; + font-size: 1.2em; + margin: 10px 0 0 10px; + } + +.warning p { /* Used on the search page (image will appear if no result is found) */ + background: url(warning.gif) no-repeat left; + height: 160px; + padding: 20px 0 0 90px; + font-size: 1.5em; + margin: 0 0 0 10px; + } + +.postinput { + margin-left: 10px; + } + +/* 4)-=-=-=- Right selectors -=-=-=- */ + +#right { + float: right; + width: 250px; + padding: 10px 15px; + + /* Box model hack used for IE5.5/5 */ + voice-family: "\"}\""; + voice-family: inherit; + width: 230px; + } + +#right li { + list-style: none; + background: url(links_bullet.gif) 0 50% no-repeat; + padding: 2px 0 2px 20px; + } + +#right ul { + padding: 10px 10px 10px 0px; + margin: 0; + } + +#right a { + font-size: .9em; + text-decoration: none; + } + +#right a:link { + color: #565D4A; + font-weight: normal; + } + +#right a:visited { + color: #aaa; + } + +#right a:hover, #right a:active { + background: #80BE14; + color: #fff; + } + +.line, .block { + border-top: 3px solid #ACE149; + /*margin-top: -5px;*/ + } + +#search { + background: url(search.gif) no-repeat; + height: 56px; + margin: 0 auto; + padding-top: 22px; + } + +#right .block-nav { + border-top: 0 !important; + } + +#right h3 { + visibility: none; height: 1px; padding: 0; margin: 0; + } + +#right h2 { + font-size: 1.4em; + margin: 20px 0 0 0; + font-weight: normal; + color: #000; + } + +p.searchinfo { + margin: -8px 0 -8px 2px; + font-size: .9em; + color: #999; + } + +.searchfield { + background: #fff; + border: 1px solid #ACE149; + color: #7DA721; + padding: 2px 5px 1px 5px; + width: 160px; + } + +.searchfield:hover { + border: 1px solid #BFBFBF; + color: #949494; + } + +.submit { + background: url(search_submit.gif) no-repeat; + height: 20px; + width: 52px; + border: 0; + margin-left: 2px; + text-indent: -9999px; + cursor: pointer; + } + +.submit:hover { + background: url(search_submit.gif) no-repeat 0 -20px; + height: 20px; + width: 52px; + border: 0; + margin-left: 2px; + cursor: pointer; + } + +.themes { + font-size: .9em; + } + +#right img { + margin: 10px 0 20px 20px; +} + +#right .menu li, #right .block-nav li { + background: url(content_bullet.gif) no-repeat 0 7px; + padding: 2px 0 0 10px; + list-style: none; +} + +/* 5)-=-=-=- Footer -=-=-=- */ + +#footer { + background: url(footer.gif) no-repeat; + height: 75px; + } + +#footer p { + padding: 30px 0 0 70px; + float: left; + text-transform: uppercase; + font-size: .9em; + color: #777; + } + +.extras { + float: right; + padding: 33px 18px 0 0; + } + +.extras a { + text-decoration: none; + font-weight: bold; + } + +.extras a:link, .extras a:visited { + background: #ccc; + color: #fff; + padding: 5px; + border: 2px solid #fff; + } + +.extras a:hover, .extras a:active { + background: #DEEEA4; + color: #7AB90C; + padding: 5px; + border: 2px solid #C9E979; + } + +.extras li { + display: inline; + } + +.extras ul { + padding: 0 0 10px 0; + margin: 0; + } + +/* 6)-=-=-=- Forms -=-=-=- */ + +input { + border: 1px solid #BFBFBF; + color: #949494; + background: #fff; + padding: 2px 5px 1px 5px; + font-size: 1em; + } + +input:hover { + background: #fff; + border: 1px solid #ACE149; + color: #7DA721; + font-size: 1em; + } + +textarea { + font-family: Arial, Verdana, Helvetica; + font-size: 1.1em; + border: 1px solid #BFBFBF; + color: #949494; + padding: 2px 5px 1px 5px; + width: 450px; + } + +textarea:hover { + background: #fff; + border: 1px solid #ACE149; + color: #7DA721; + } + +/* 7)-=-=-=- Accessibility -=-=-=- */ + +#skip { + display: none; + } + +hr { /* Simple style when CSS not in use */ + display: none; + } + +/* 8)-=-=-=- Hacks -=-=-=- */ + +.clearfix:after { /* float hack used to float content correctly */ + content: "."; + display: block; + height: 0; + clear: both; + visibility: hidden; + } + +/* Hides from IE-mac \*/ +* html .clearfix {height: 1%;} /* End hide from IE-mac */ \ No newline at end of file