Mercurial > hg > soundsoftware-drupal-theme
changeset 2:6b9d46abd911
Redo for new layout -- not yet completed
| author | Chris Cannam |
|---|---|
| date | Tue, 06 Dec 2011 17:06:58 +0000 |
| parents | 10b7ded9b083 |
| children | e741fbf78fba |
| files | html-elements.css layout.css page.tpl.php soundsoftware.css soundsoftware_ac_uk_subtitle_transparent.png template.php |
| diffstat | 6 files changed, 90 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- a/html-elements.css Wed Jul 13 15:24:05 2011 +0100 +++ b/html-elements.css Tue Dec 06 17:06:58 2011 +0000 @@ -59,10 +59,19 @@ body, caption, th, td, input, textarea, select, option, legend, fieldset, h1, h2, h3, h4, h5, h6 { font-family: GilliusADFNo2, Candara, Tahoma, Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif; - background: #fdfaf0; +/* background: #fdfaf0; */ + background: #fdfbf5; color: #3e442c; } + .twtr-widget, .twtr-tweets, .twtr-join-conv { + font-family: GilliusADFNo2, Candara, Tahoma, Verdana, Arial, Helvetica, "Bitstream Vera Sans", sans-serif !important; + line-height: 1.3em !important; + } + + .twtr-hd { display: none; } + .twtr-ft { display: none; } + pre, code { font-size: 1.1em; /* Monospace fonts can be hard to read */ @@ -137,6 +146,10 @@ font-weight: normal; } + td h3, td h4 { + margin-bottom: 0; + } + /** block-level elements **/ p, ul, ol, dl, pre, table, fieldset, blockquote {
--- a/layout.css Wed Jul 13 15:24:05 2011 +0100 +++ b/layout.css Tue Dec 06 17:06:58 2011 +0000 @@ -295,3 +295,10 @@ overflow-y: hidden; } */ + + td.col-first { padding-right: 2em; } + + .views-view-grid td { vertical-align: top; } + + .views-view-grid .views-field-image-attach-images { float: left; margin-right: 0.8em; } +
--- a/page.tpl.php Wed Jul 13 15:24:05 2011 +0100 +++ b/page.tpl.php Tue Dec 06 17:06:58 2011 +0000 @@ -110,17 +110,17 @@ <?php if ($site_name): ?> <?php if ($title): ?> + <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"> <div id="site-name"><strong> + <?php print $site_name; ?> + </strong></div> + </a> + <?php else: ?> <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"> + <h1 id="site-name"> <?php print $site_name; ?> + </h1> </a> - </strong></div> - <?php else: ?> - <h1 id="site-name"> - <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"> - <?php print $site_name; ?> - </a> - </h1> <?php endif; ?> <?php endif; ?> @@ -196,7 +196,8 @@ <?php if ($primary_links): ?> <div id="primary" class="clear-block"> - <?php print theme('links', $primary_links); ?> +<!-- <?php print theme('links', $primary_links); ?> --> + <?php print menu_tree($menu_name = 'primary-links'); ?> </div> <!-- /#primary --> <?php endif; ?>
--- a/soundsoftware.css Wed Jul 13 15:24:05 2011 +0100 +++ b/soundsoftware.css Tue Dec 06 17:06:58 2011 +0000 @@ -84,7 +84,7 @@ /* text-align: center; */ width: 447px; height: 59px; - background: url('soundsoftware_ac_uk_subtitle_flat.png') no-repeat 0 0; + background: url('soundsoftware_ac_uk_subtitle_transparent.png') no-repeat 0 0; text-indent: -9999px; padding: 0; padding-bottom: 0.1em; @@ -252,6 +252,7 @@ .feed-icons /* The links to the RSS or Atom feeds for the current list of content */ { + display: none; /* we have feeds in .f-right instead */ margin: 1em 0; } @@ -279,8 +280,9 @@ #primary /* Primary links */ { - float: left; + float: right; margin-left: 20%; + margin-right: 20%; margin-top: 0; padding-top: 0; margin-bottom: 0.5em; @@ -290,10 +292,12 @@ #primary li { + list-style-type: none; + list-style-image: none; margin: 0px; border-left: 1px solid #a9b680; - padding-left: 1em; - padding-right: 1em; + padding-left: 13px; + padding-right: 13px; color: #800; } @@ -302,7 +306,7 @@ margin: 0px; border-left: 0; padding-left: 0; - padding-right: 1em; + padding-right: 13px; color: #800; } @@ -310,11 +314,44 @@ { margin: 0px; border-left: 1px solid #a9b680; - padding-left: 1em; + padding-left: 13px; padding-right: 0; color: #800; } + #primary li li, #primary li li.first, #primary li li.last { + border-left: 0; + padding-left: 0; + } + + #primary li ul { + display: none; + } + + #primary li:hover ul { + display: block; + background: #fdfbf5; + clear: both; + float: left; + margin-left: 0; + width: 30%; + position: absolute; + padding-top: 0.8em; + margin-top: 0; + padding-bottom: 0.5em; + margin-bottom: 0.5em; + padding-left: 13px; + margin-left: -14px; + border-left: 1px solid #a9b680; + } + + #primary li li { + float: none; + padding: 0 10px 0 0; + list-style: disc; + list-style-position: inside; + } + #secondary /* Secondary links */ { } @@ -871,7 +908,7 @@ float: left; width: 78%; } - +/* .f-right { float:right; margin-left:-20%; @@ -879,8 +916,22 @@ padding:0; width:20.5%; } +*/ + .f-right + { + display: block; + position: fixed; + right: 1em; + top: 1em; + margin: 1em 0; + } + .item-list .pager { font-size: 0.85em; padding-top: 1em; } + + #ssamr-summary { + font-size: 1.1em; + }
--- a/template.php Wed Jul 13 15:24:05 2011 +0100 +++ b/template.php Tue Dec 06 17:06:58 2011 +0000 @@ -175,9 +175,9 @@ // new lines for the titles $nextTitle = isset($nav['next']) ? check_plain(db_result(db_query('SELECT title FROM {node} WHERE nid = %d',$nav['next']))) : ''; $prevTitle = isset($nav['prev']) ? check_plain(db_result(db_query('SELECT title FROM {node} WHERE nid = %d',$nav['prev']))) : ''; - $vars['previous'] = !empty($nav['prev']) ? l("< Previous article (" . $prevTitle . ")", 'node/'. $nav['prev']) : ''; + $vars['previous'] = !empty($nav['prev']) ? l("< Newer article: " . $prevTitle . "", 'node/'. $nav['prev']) : ''; $vars['key'] = t('@count of @count_total', array('@count' => ($nav['current_index'] + 1), '@count_total' => count($nav['full_list']))); - $vars['next'] = !empty($nav['next']) ? l("Next article (" . $nextTitle . ") >", 'node/'. $nav['next']) : ''; + $vars['next'] = !empty($nav['next']) ? l("Older article: " . $nextTitle . " >", 'node/'. $nav['next']) : ''; // comment out these 3 lines // $vars['previous'] = !empty($nav['prev']) ? l('‹ ' . t('previous'), 'node/'. $nav['prev']) : '';