Permalink
Browse files

Version 3 Release

Updated several files with erroneous material - comment template from
index.php, and archive. Small menu js with wrong variable.

I also removed the social media icons and replaced them with genericons.

I updated the navigation and mobile navigation. The mobile nav has a
clickable menu and the CSS has been cleaned up and only uses solid
colours.
  • Loading branch information...
crondeau committed Mar 27, 2013
1 parent 9336dcd commit 75d370f4ec402ee3ee1697c343c0a04f7352f4a7
@@ -55,13 +55,7 @@

</article>

<?php comments_template(); ?>

<?php endwhile; else: ?>

<p><?php _e( 'Sorry, there are currently no posts.', 'blm_basic' ); ?></p>

<?php endif; ?>
<?php endwhile; endif; ?>

<?php get_template_part( 'inc/nav' ); ?>

Binary file not shown.

Large diffs are not rendered by default.

Oops, something went wrong.
Binary file not shown.
Binary file not shown.
@@ -24,7 +24,7 @@
<meta charset="<?php bloginfo('charset'); ?>" />
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<title><?php wp_title('&#124;', true, 'right'); ?><?php bloginfo('name'); ?></title>
<title><?php wp_title(); ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
<link rel="shortcut icon" href="<?php echo get_template_directory_uri() ?>/favicon.ico" />
@@ -36,8 +36,8 @@
<body <?php body_class(); ?>>

<div id="wrap">

<header id="branding">
<header id="branding" class="site-header" role="banner">
<hgroup>
<h1 id="logo"><a href="<?php echo home_url() ?>/"><?php bloginfo( 'name' ); ?></a></h1>
<h2 id="tagline"><?php bloginfo( 'description' ); ?></h2>
@@ -48,15 +48,18 @@
<?php $header_image = get_header_image();
if ( ! empty( $header_image ) ) { ?>

<img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" />
<a href="<?php echo home_url() ?>/"><img src="<?php header_image(); ?>" width="<?php echo HEADER_IMAGE_WIDTH; ?>" height="<?php echo HEADER_IMAGE_HEIGHT; ?>" alt="" /></a>

<?php } ?>
</hgroup>
</header>

<nav id="top-nav" role="navigation" class="site-navigation">
<h1 class="assistive-text"><?php _e( 'Menu', 'blm_basic' ); ?></h1>
<div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'blm_basic' ); ?>"><?php _e( 'Skip to content', 'blm_basic' ); ?></a></div>

<?php wp_nav_menu( array( 'container_class' => 'menu-header', 'theme_location' => 'primary' ) ); ?>
</nav>
<nav class="site-navigation main-navigation">
<h1 class="assistive-text"><?php _e( 'menu', 'blm_basic' ); ?></h1>
<div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'blm_basic' ); ?>"><?php _e( 'Skip to content', 'blm_basic' ); ?></a></div>

<?php wp_nav_menu( array( 'theme_location' => 'primary' ) ); ?>
</nav>

</header>


BIN +6 KB images/.DS_Store
Binary file not shown.
Binary file not shown.
@@ -127,12 +127,12 @@ function blm_customize($wp_customize) {
'type' => 'text',
) );
$wp_customize->add_setting( 'delicious', array(
$wp_customize->add_setting( 'tumblr', array(
'default' => '',
) );
$wp_customize->add_control( 'delicious', array(
'label' => __( 'Delcious url:', 'blm_basic' ),
$wp_customize->add_control( 'tumblr', array(
'label' => __( 'Tumblr url:', 'blm_basic' ),
'section' => 'blm_socmed_settings',
'type' => 'text',
) );
@@ -8,47 +8,58 @@

<ul class="social-media">
<?php if ( get_theme_mod( 'twitter' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'twitter' ); ?>" class="twitter" target="_blank"><?php _e( 'Twitter', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-twitter"></div>
<a href="<?php echo get_theme_mod( 'twitter' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'facebook' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'facebook' ); ?>" class="facebook" target="_blank"><?php __( 'Facebook', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-facebook-alt"></div>
<a href="<?php echo get_theme_mod( 'facebook' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'pinterest' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'pinterest' ); ?>" class="pinterest" target="_blank"><?php __( 'Pinterest', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-pinterest"></div>
<a href="<?php echo get_theme_mod( 'pinterest' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'linkedin' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'linkedin' ); ?>" class="linkedin" target="_blank"><?php _e( 'LinkedIn', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-linkedin"></div>
<a href="<?php echo get_theme_mod( 'linkedin' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'googleplus' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'googleplus' ); ?>" class="googleplus" target="_blank"><?php __( 'Google Plus', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-googleplus"></div>
<a href="<?php echo get_theme_mod( 'googleplus' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'flickr' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'flickr' ); ?>" class="flickr" target="_blank"><?php __( 'Flickr', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-flickr"></div>
<a href="<?php echo get_theme_mod( 'flickr' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'youtube' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'youtube' ); ?>" class="youtube" target="_blank"><?php __( 'YouTube', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-youtube"></div>
<a href="<?php echo get_theme_mod( 'youtube' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'vimeo' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'vimeo' ); ?>" class="vimeo" target="_blank"><?php __( 'Vimeo', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-vimeo"></div>
<a href="<?php echo get_theme_mod( 'vimeo' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'dribble' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'dribble' ); ?>" class="dribble" target="_blank"><?php __( 'Dribble', 'blm_basic' ); ?></a></li>
<li><div class="genericon genericon-dribbble"></div>
<a href="<?php echo get_theme_mod( 'dribble' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'delicious' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'delicious' ); ?>" class="delicious" target="_blank"><?php _e( 'Delicious', 'blm_basic' ); ?></a></li>
<?php if ( get_theme_mod( 'tumblr' ) ) : ?>
<li><div class="genericon genericon-tumblr"></div>
<a href="<?php echo get_theme_mod( 'tumblr' ); ?>" target="_blank"></a></li>
<?php endif; ?>

<?php if ( get_theme_mod( 'github' ) ) : ?>
<li><a href="<?php echo get_theme_mod( 'github' ); ?>" class="github" target="_blank"><?php _e( 'Git Hub', 'blm_basic' ); ?></a></li>
<?php endif; ?>
<li><div class="genericon genericon-github"></div>
<a href="<?php echo get_theme_mod( 'github' ); ?>" target="_blank"></a></li>
<?php endif; ?>

</ul><!-- #social-icons-->
@@ -23,15 +23,7 @@

</article>

<?php comments_template(); ?>

<?php endwhile; else: ?>

<h2><?php _e( 'Not Found', 'blm_basic' ); ?></h2>

<p><?php _e( 'Sorry, you seem to be looking for something that simply is not here.', 'blm_basic' ); ?></p>

<?php endif; ?>
<?php endwhile; endif; ?>

<?php get_template_part( 'inc/nav' ); ?>

@@ -2,15 +2,15 @@
* Handles toggling the main navigation menu for small screens.
*/
jQuery( document ).ready( function( $ ) {
var $masthead = $( '#masthead' ),
var $branding = $( '#branding' ),
timeout = false;

$.fn.smallMenu = function() {
$masthead.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
$masthead.find( '.site-navigation h1' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );
$branding.find( '.site-navigation' ).removeClass( 'main-navigation' ).addClass( 'main-small-navigation' );
$branding.find( '.site-navigation h1' ).removeClass( 'assistive-text' ).addClass( 'menu-toggle' );

$( '.menu-toggle' ).unbind( 'click' ).click( function() {
$masthead.find( '.menu' ).toggle();
$branding.find( '.menu' ).toggle();
$( this ).toggleClass( 'toggled-on' );
} );
};
@@ -30,9 +30,9 @@ jQuery( document ).ready( function( $ ) {
if ( browserWidth < 600 ) {
$.fn.smallMenu();
} else {
$masthead.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
$masthead.find( '.site-navigation h1' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
$masthead.find( '.menu' ).removeAttr( 'style' );
$branding.find( '.site-navigation' ).removeClass( 'main-small-navigation' ).addClass( 'main-navigation' );
$branding.find( '.site-navigation h1' ).removeClass( 'menu-toggle' ).addClass( 'assistive-text' );
$branding.find( '.menu' ).removeAttr( 'style' );
}
}, 200 );
} );
Oops, something went wrong.

0 comments on commit 75d370f

Please sign in to comment.