### Eclipse Workspace Patch 1.0 #P drupal Index: themes/bluemarine/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/bluemarine/page.tpl.php,v retrieving revision 1.26 diff -u -r1.26 page.tpl.php --- themes/bluemarine/page.tpl.php 5 Dec 2007 16:34:05 -0000 1.26 +++ themes/bluemarine/page.tpl.php 24 Dec 2007 22:20:42 -0000 @@ -10,54 +10,48 @@ - - - - - - - - - - - - + +
+ +
+ + +
+
+
+ +

+
+ + + + +
+
+ + - - - - - - -
-
-
- -

-
- - - - -
-
+ - + - + \ No newline at end of file Index: themes/bluemarine/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/bluemarine/style.css,v retrieving revision 1.23 diff -u -r1.23 style.css --- themes/bluemarine/style.css 17 Dec 2007 15:05:09 -0000 1.23 +++ themes/bluemarine/style.css 24 Dec 2007 22:20:42 -0000 @@ -1,198 +1,316 @@ /* $Id: style.css,v 1.23 2007/12/17 15:05:09 goba Exp $ */ +/* Layout +*************************************************/ /* -** HTML elements -*/ + * LC: left column + * RC: right column + */ body { margin: 0; - padding: 0; - color: #000; - background-color: #fff; - font: 76% Verdana, Arial, Helvetica, sans-serif; -} -tr.odd td, tr.even td { - padding: 0.3em; -} -h1, h2, h3, h4, h5, h6 { - margin-bottom: 0.5em; -} -h1 { - font-size: 1.3em; -} -h2 { - font-size: 1.2em; + min-width: 220px; /* LC fullwidth */ } -h3, h4, h5, h6 { - font-size: 1.1em; -} -p { - margin-top: 0.5em; - margin-bottom: 0.9em; -} -a { - text-decoration: none; - font-weight: bold; + +body.sidebar-left +{ + padding-left: 220px; /* LC fullwidth */ } -a:link { - color: #39c; + +body.sidebar-right +{ + padding-right: 220px; /* RC fullwidth */ } -a:visited { - color: #369; + +body.two-sidebars +{ + padding-left: 220px; /* LC fullwidth */ + padding-right: 220px; /* RC fullwidth */ } -a:hover { - color: #39c; - text-decoration: underline; + +.two-sidebars #header, .two-sidebars #footer { + margin-left: -220px; /* LC fullwidth */ + margin-right: -220px; /* RC fullwidth */ } -fieldset { - border: 1px solid #ccc; + +.sidebar-right #header, .sidebar-right #footer { + margin-right: -220px; /* RC fullwidth */ } -pre { - background-color: #eee; - padding: 0.75em 1.5em; - font-size: 12px; - border: 1px solid #ddd; + +.sidebar-left #header, .sidebar-left #footer { + margin-left: -220px; /* LC fullwidth */ } -table { - /* make sizes relative to body size! */ - font-size: 1em; + +.column { + position: relative; + float: left; } -.form-item label { - font-size: 1em; - color: #222; + +#main-content { + padding: 0; + width: 100%; } -.item-list .title { - font-size: 1em; - color: #222; + +#sidebar-left { + width: 200px; /* LC width */ + padding: 0 10px; /* LC padding */ + right: 220px; /* LC fullwidth */ + margin-left: -100%; } -.links { - margin-bottom: 0; + +#sidebar-right { + width: 200px; /* RC width */ + padding: 0 10px; /* RC padding */ + margin-right: -100%; } -.comment .links { - margin-bottom: 0; + +#footer { + clear: both; } -/* -** Page layout blocks / IDs -*/ -#header, #content { - width: 100%; +/*** IE Fix ***/ +* html #sidebar-left { + left: 220px; /* RC fullwidth */ } + +/* Header +*************************************************/ #header { background-color: #69c; + height: 80px; } + #logo { - vertical-align: middle; - border: 0; + float: left; + padding-top: 12.5px; /* (80 - 55 (logo)) / 2 */ + height: 67.5px; /* 80 - padding-top */ } + #logo img { float: left; /* LTR */ padding: 0 1em; - border: 0; + border: 0px; +} + +.site-name { + margin: 0.6em 0 0; + padding: 0; + font-size: 2em; +} + +.site-name a:link, .site-name a:visited { + color: #fff; } + +.site-name a:hover { + color: #369; + text-decoration: none; +} + +.site-slogan { + font-size: 1em; + color: #eee; + display: block; + margin: 0; + font-style: italic; + font-weight: bold; +} + #menu { - padding: 0.5em 0.5em 0 0.5em; /* LTR */ - text-align: right; /* LTR */ - vertical-align: middle; + float: right; + padding-right: 5px; + text-align: right; } + #navlist { font-size: 1.0em; - padding: 0 0.8em 1.2em 0; /* LTR */ + padding: 0 0.8em 1.3em 0; /* LTR */ color: #9cf; } + #navlist a { font-weight: bold; color: #fff; } + #subnavlist { - padding: 0.5em 1.2em 0.4em 0; /* LTR */ + padding: 0.8em 1.2em 0.4em 0; /* LTR */ font-size: 0.8em; color: #9cf; + text-align: right; } + #subnavlist a { font-weight: bold; color: #9cf; } + ul.links li { border-left: 1px solid #9cf; /* LTR */ } + ul.links li.first { border: none; } + #search .form-text, #search .form-submit { border: 1px solid #369; font-size: 1.1em; height: 1.5em; vertical-align: middle; } + #search .form-text { width: 8em; padding: 0 0.5em; } + +/* Middle +*************************************************/ +#main +{ + background-color: white; + padding: 10px; +} + +#sidebar-left, #sidebar-right +{ + background-color: #ddd; + padding-top: 10px; + padding-bottom: 10px; +} + +/* Footer +*************************************************/ +#footer +{ + background-color: #eee; + padding: 1em; + font-size: 0.8em; +} + +/* General +*************************************************/ #mission { background-color: #369; padding: 1.5em 2em; color: #fff; } + #mission a, #mission a:visited { color: #9cf; font-weight: bold; } -.site-name { - margin: 0.6em 0 0 ; - padding: 0; - font-size: 2em; -} -.site-name a:link, .site-name a:visited { - color: #fff; -} -.site-name a:hover { - color: #369; - text-decoration: none; -} -.site-slogan { - font-size: 1em; - color: #eee; - display: block; - margin: 0; - font-style: italic; - font-weight: bold; -} -#main { - /* padding in px not ex because IE messes up 100% width tables otherwise */ - padding: 10px; -} + #mission, .node .content, .comment .content { line-height: 1.4em; } + #help { font-size: 0.9em; margin-bottom: 1em; } + .breadcrumb { margin-bottom: .5em; } + .messages { background-color: #eee; border: 1px solid #ccc; padding: 0.3em; margin-bottom: 1em; } + .error { border-color: red; } -#sidebar-left, #sidebar-right { - background-color: #ddd; - width: 16em; - /* padding in px not ex because IE messes up 100% width tables otherwise */ - padding: 10px; - vertical-align: top; + +/* HTML Elements +*************************************************/ +body { + color: #000; + background-color: #fff; + font: 76% Verdana, Arial, Helvetica, sans-serif; } -#footer { + +tr.odd td, tr.even td { + padding: 0.3em; +} + +h1, h2, h3, h4, h5, h6 { + margin-bottom: 0.5em; +} + +h1 { + font-size: 1.3em; +} + +h2 { + font-size: 1.2em; +} + +h3, h4, h5, h6 { + font-size: 1.1em; +} + +p { + margin-top: 0.5em; + margin-bottom: 0.9em; +} + +a { + text-decoration: none; + font-weight: bold; +} + +a:link { + color: #39c; +} + +a:visited { + color: #369; +} + +a:hover { + color: #39c; + text-decoration: underline; +} + +fieldset { + border: 1px solid #ccc; +} + +pre { background-color: #eee; - padding: 1em; - font-size: 0.8em; + padding: 0.75em 1.5em; + font-size: 12px; + border: 1px solid #ddd; +} + +table { + /* make sizes relative to body size! */ + font-size: 1em; +} + +.form-item label { + font-size: 1em; + color: #222; } +.item-list .title { + font-size: 1em; + color: #222; +} + +.links { + margin-bottom: 0; +} + +.comment .links { + margin-bottom: 0; +} + + /* ** Common declarations for child classes of node, comment, block, box, etc. ** If you want any of them styled differently for a specific parent, add @@ -203,62 +321,77 @@ font-weight: bold; font-size: 1.3em; color: #777; - margin: 0 auto; /* decrease default margins for h.title */ + margin: 0 auto; /* decrease default margins for h.title */ } + .submitted { color: #999; font-size: 0.8em; } + .links { color: #999; } + .links a { font-weight: bold; } + .block, .box { padding: 0 0 1.5em 0; /* LTR */ } + .block { border-bottom: 1px solid #bbb; padding-bottom: 0.75em; margin-bottom: 1.5em; } + .block .title { margin-bottom: .25em; } + .box .title { font-size: 1.1em; } + .node { margin: .5em 0 2em; /* LTR */ } + .sticky { padding: .5em; background-color: #eee; border: solid 1px #ddd; } + .node .content, .comment .content { margin: .5em 0 .5em; } + .node .taxonomy { color: #999; font-size: 0.8em; padding-left: 1.5em; /* LTR */ } + .node .picture { border: 1px solid #ddd; float: right; /* LTR */ margin: 0.5em; } + .comment { border: 1px solid #abc; padding: .5em; margin-bottom: 1em; } + .comment .title a { font-size: 1.1em; font-weight: normal; } + .comment .new { text-align: right; /* LTR */ font-weight: bold; @@ -266,6 +399,7 @@ float: right; /* LTR */ color: red; } + .comment .picture { border: 1px solid #abc; float: right; /* LTR */ @@ -281,68 +415,86 @@ padding: 1em; margin: 1em 0; } + #aggregator .news-item .categories, #aggregator .source, #aggregator .age { color: #999; font-style: italic; font-size: 0.9em; } + #aggregator .title { margin-bottom: 0.5em; font-size: 1em; } + #aggregator h3 { margin-top: 1em; } + #forum table { width: 100%; } + #forum td { padding: 0.5em; } + #forum td.forum, #forum td.posts { background-color: #eee; } + #forum td.topics, #forum td.last-reply { background-color: #ddd; } + #forum td.container { background-color: #ccc; } + #forum td.container a { color: #555; } + #forum td.statistics, #forum td.settings, #forum td.pager { height: 1.5em; border: 1px solid #bbb; } + #forum td .name { color: #96c; } + #forum td .links { padding-top: 0.7em; font-size: 0.9em; } + #profile .profile { clear: both; border: 1px solid #abc; padding: .5em; margin: 1em 0em; } + #profile .profile .name { padding-bottom: 0.5em; } + .block-forum h3 { margin-bottom: .5em; } + div.admin-panel .description { color: #999; } + div.admin-panel .body { background: #f4f4f4; } + div.admin-panel h3 { background-color: #69c; color: #fff; padding: 5px 8px 5px; margin: 0; -} +} \ No newline at end of file