Skip to content

Commit

Permalink
global widgetized sidebar and removal of fixed positioning
Browse files Browse the repository at this point in the history
  • Loading branch information
pnts committed Oct 10, 2010
1 parent cd641c8 commit d8074fb
Show file tree
Hide file tree
Showing 5 changed files with 76 additions and 19 deletions.
2 changes: 1 addition & 1 deletion functions.php
Expand Up @@ -21,7 +21,7 @@ function oulipo_header_style() { ?>
margin-bottom: 30px;
}
#main_nav h1.masthead a { color:#<?php header_textcolor();?>; }
</style> <?php }
</style><?php }

function oulipo_admin_header_style() { ?>
<style type="text/css">
Expand Down
2 changes: 1 addition & 1 deletion index.php
Expand Up @@ -6,7 +6,7 @@
<?php while (have_posts()) : the_post(); ?>
<?php if(is_home()) { if ( function_exists('wp_list_comments') ) { ?> <div <?php post_class(); ?>> <?php }} ?>
<h2 class="title"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
<p class="date"><?php the_time('F jS, Y') ?> <?php comments_popup_link('<span class="commentcount">&sect; 0</span>', '<span class="commentcount">&sect; 1</span>', '<span class="commentcount">&sect; %</span>'); ?></p>
<p class="date"><?php the_time('F jS, Y') ?> &sect; <?php comments_popup_link('<span class="commentcount">0 comments</span>', '<span class="commentcount">1 comment</span>', '<span class="commentcount"> % comments</span>'); ?> &sect; <a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>">permalink</a></p>

<?php if(is_search()) : ?>
<div class="entry search-results">
Expand Down
48 changes: 48 additions & 0 deletions sidebar.php
Expand Up @@ -40,6 +40,12 @@
<p class="edit"><?php edit_post_link('Edit', '', ''); ?></p>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>


<?php } elseif (is_category()) { ?>
<div class="post_nav">
Expand All @@ -49,41 +55,77 @@
<div class="spacer"></div>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_tag()) { ?>
<div class="post_nav">
<h3>Where Am I?</h3>
<p>You are currently browsing entries tagged with <strong><?php single_tag_title(); ?></strong> at
<a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?>.</p>
<div class="spacer"></div>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_month()) { ?>
<div class="post_nav">
<h3>Where am I?</h3>
<p>You are currently viewing the archives for <strong><?php the_time('F, Y'); ?></strong> at <a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
<div class="spacer"></div>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_year ()) { ?>
<div class="post_nav">
<h3>Where am I?</h3>
<p>You are currently viewing the archives for <strong><?php the_time('Y'); ?></strong> at <a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
<div class="spacer"></div>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_day()) { ?>
<div class="post_nav">
<h3>Where am I?</h3>
<p>You are currently viewing the archives for <strong><?php the_time('l, F jS, Y'); ?></strong> at <a href="<?php bloginfo('url'); ?>"><?php bloginfo('name'); ?></a>.</p>
<div class="spacer"></div>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_search()) {?>
<div class="post_nav">
<h3>Search Results</h3>
<p>You are currently viewing the search results for <strong><?php the_search_query(); ?></strong>.</p>
<div class="spacer"></div>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_page('about')) {?>
<div class="post_nav">
Expand All @@ -92,6 +134,12 @@
<?php wp_list_bookmarks('categorize=0&title_li=0&title_after=&title_before=');?>
</ul>
</div>

<ul>
<?php if ( !function_exists('dynamic_sidebar')
|| !dynamic_sidebar() ) : ?>
<?php endif; ?>
</ul>

<?php } elseif (is_page('contact')) {?>
<?php } ?>
Expand Down
2 changes: 1 addition & 1 deletion single.php
Expand Up @@ -6,7 +6,7 @@
<?php while (have_posts()) : the_post(); ?>
<?php if(is_home()) { if ( function_exists('wp_list_comments') ) { ?> <div <?php post_class(); ?>> <?php }} ?>
<h2 class="title"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php the_title_attribute(); ?>"><?php the_title(); ?></a></h2>
<p class="date"><?php the_time('F jS, Y') ?> <?php comments_popup_link('&sect; <span class="commentcount">0</span>', '&sect; <span class="commentcount">1</span>', '&sect; <span class="commentcount">%</span>'); ?></p>
<p class="date"><?php the_time('F jS, Y') ?> <?php comments_popup_link('&sect; <span class="commentcount">0 comments</span>', '&sect; <span class="commentcount">1 comment</span>', '&sect; <span class="commentcount">% comments</span>'); ?></p>

<div class="entry">
<?php { if ( function_exists('add_theme_support')) the_post_thumbnail( 'post-thumbnail' ); } ?>
Expand Down
41 changes: 25 additions & 16 deletions style.css
Expand Up @@ -219,7 +219,7 @@ dd.gallery-caption {
/* =Typography
------------------------------------------------------------------*/

body, .delicious-desc, #commentform textarea, .archive #content {
body, .delicious-desc, #commentform textarea, .archive #content, #footer {
font-family: "Lucida Grande", "Lucida Sans Unicode", verdana, sans-serif;
background: #FFF;
}
Expand All @@ -246,6 +246,7 @@ h2.title {
font-size: 1.7em;
margin-bottom: 1em;
padding-bottom: .13em;
border-bottom: 1px solid #EEE;
}

.entry h1, .entry h2, .entry h3,
Expand Down Expand Up @@ -281,8 +282,8 @@ h2.title {
}

#supplementary h3, h2.widgettitle {
margin: 2em 0 -.7em 0;
font-size: 1.15em;
margin: 2em 0 -10px 0;
font-size: 14px;
font-variant: small-caps;
border-bottom: none;
}
Expand Down Expand Up @@ -336,13 +337,14 @@ h3#comments {

.description, #content .date {
font-size: .8em;
color: #aaa;
color: #666;
}

.commentcount {
color: #aaa ;
color: #666;
}


#entry_content .date {
margin: -1.8em 0 1.3em 0;
}
Expand Down Expand Up @@ -461,8 +463,16 @@ blockquote {
list-style-type: none;
}

#supplementary ul li ul li {
border-bottom: 1px dotted #EEE;
#supplementary ul ul ul {
margin-left: 10px;
}

#supplementary .meta ul.children {
margin-top: 0;
}

#supplementary .meta ul li ul {
margin-top: 10px;
}

#supplementary p {
Expand Down Expand Up @@ -532,7 +542,6 @@ li.footnote {
}

.post_nav {
position: fixed;
width: 15.5em;
}

Expand All @@ -556,7 +565,7 @@ code {

#entry_content .pagination p span,
#entry_content p.tags span {
color: #AAA;
color: #666;
font-style: italic;
font-size: 1.1em;
}
Expand Down Expand Up @@ -648,10 +657,6 @@ a:hover, a:hover span {
border-right: none;
}

h2.title {
border-bottom: 1px solid #EEE;
}

h2 a, #main_nav a {
color: #000;
}
Expand Down Expand Up @@ -692,6 +697,10 @@ img a, img a:hover {
border-bottom: 0;
}

#supplementary ul.single_post_meta a {
display: inline;
}

#main_nav li {
border-bottom: 1px solid #EEE;
}
Expand Down Expand Up @@ -727,13 +736,13 @@ img a, img a:hover {
}

.entry a.more-link {
color: #AAA;
color: #666;
font-style: italic;
font-size: 1.1em;
font-size: 14px;
border: 0;
text-align: center;
display: block;
margin: -1em auto 0 auto;
margin: 0 auto 0 auto;
text-transform: none;
font-weight: normal;
clear: both;
Expand Down

0 comments on commit d8074fb

Please sign in to comment.