* Add SSN style for Custom Post Type Parents plugin.

* Remove general input/button 100% width for sidebar.

README.md

@@ -1,17 +1,8 @@
-Trestle (beta)
+Trestle
 =======
 
-**IMPORTANT: If you're using a version of Trestle that is prior to the [commit e3db022b760254df95cc6e306ea53b3da46b6ed1](https://github.com/MickeyKay/trestle/commit/e3db022b760254df95cc6e306ea53b3da46b6ed1), please make sure to update your version of Trestle, or at least merge in the changes in this commit or a later commit, including changes to these files:**
-* functions.php
-* lib/functions/theme-functions.php
-* lib/admin/admin-functions.php
-
-This will ensure you avoid the bug in which posts spontaneously switch post_type when looping through a query.
-
-=======
-
-
 ### A handy boilerplate child theme for serious Genesis developers.
+[![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/MickeyKay/trestle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 ### [View Demo →](http://demo.mightyminnow.com/theme/trestle/)
 
@@ -36,3 +27,20 @@ Here are some of Trestle's many features, check out the [Trestle Demo](http://de
 #### Settings & Usage
 * The Trestle control panel is located at **Genesis → Theme Settings**, in the **Trestle** metabox.
 * Examples and usage can all be viewed on the [Trestle Demo](http://demo.mightyminnow.com/theme/trestle/)
+
+#### To Do
+* Add ability to click off of mobile menu/search to hide menu/search.
+* Rework menu CSS for simplicity (general / primary / secondary / header)
+* Convert non-theme functionality to separate Genesis-dependant plugin
+* Add in Grunt support for:
+    * Sass
+    * Auto-ordering of CSS (CSSComb)
+    * Translation
+    * Check other themes for other ideas. . .
+* Switch to customizer for theme options instead of Genesis panel (pros? cons?)
+* Remove custom background CSS that doesn't make sense (different max-widths, etc)
+* Weird extra icons on accordions on demo site.
+* Add checkbox to control author box (along with post info/meta) output (see ES: esw-custom.php)
+* Mobile menu button setting - either:
+   * Remove (currently controlled from JS), or
+   * Pass icon/text as params to jQuery

functions.php

@@ -1,44 +1,49 @@
 <?php
 
 /**
- * Trestle theme functionality
+ * Theme functionality
  *  
  * @since  1.0.0
  * 
  * @package Trestle
  */
 
+/*===========================================
+ * Required Files
+===========================================*/
+
+// Theme functions
+require_once dirname( __FILE__ ) . '/includes/functions/theme-functions.php';
+
+// Admin functionality
+require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
+
+// Shortcodes
+require_once dirname( __FILE__ ) . '/includes/shortcodes/shortcodes.php';
+
+// Additional sidebars
+require_once dirname( __FILE__ ) . '/includes/widget-areas/widget-areas.php';
+
+// Plugin activation class
+require_once dirname( __FILE__ ) . '/includes/classes/class-tgm-plugin-activation.php';
+
+
 add_action( 'genesis_setup' ,'trestle_theme_setup', 15 );
+/**
+ * Initialize Trestle
+ *
+ * @since  1.0.0
+ */
 function trestle_theme_setup() {
 
 	/*===========================================
-	 * Required Files
-	===========================================*/
-	
-	// Trestle theme functions
-	require_once dirname( __FILE__ ) . '/lib/functions/theme-functions.php';
-
-	// Admin functionality
-	require_once dirname( __FILE__ ) . '/lib/admin/admin.php';
-	
-	// Shortcodes
-	require_once dirname( __FILE__ ) . '/lib/shortcodes/shortcodes.php';
-
-	// Additional sidebars
-	require_once dirname( __FILE__ ) . '/lib/sidebars/sidebars.php';
-	
-	// Plugin activation class
-	require_once dirname( __FILE__ ) . '/lib/classes/class-tgm-plugin-activation.php';
-
-
-	/*===========================================
-	 * Trestle Theme Setup
+	 * Theme Setup
 	===========================================*/
 
 	// Child theme definitions (do not remove)
 	define( 'CHILD_THEME_NAME', 'Trestle' );
 	define( 'CHILD_THEME_URL', 'http://demo.mightyminnow.com/theme/trestle/' );
-	define( 'CHILD_THEME_VERSION', '1.0.0' );
+	define( 'CHILD_THEME_VERSION', '1.2.0' );
 
 	// Load theme text domain
 	load_theme_textdomain( 'trestle', get_stylesheet_directory() . '/languages' );
@@ -49,69 +54,8 @@ function trestle_theme_setup() {
 	// Add viewport meta tag for mobile browsers
 	add_theme_support( 'genesis-responsive-viewport' );
 
-	// Add support for custom background
-	add_theme_support( 'custom-background' );
-
 	// Add support for footer widgets if specified in Trestle settings
 	$trestle_footer_widgets_number = esc_attr( genesis_get_option( 'trestle_footer_widgets_number' ) );
 	add_theme_support( 'genesis-footer-widgets', $trestle_footer_widgets_number );
 
-
-	/*===========================================
-	 * Widget Areas
-	===========================================*/
-	
-	add_action( 'widgets_init', 'trestle_register_widget_areas' );
-
-
-	/*===========================================
-	 * Head Styles & Scripts
-	===========================================*/
-
-	add_action( 'wp_enqueue_scripts', 'trestle_header_actions' );
-
-	/*===========================================
-	 * Body Classes
-	===========================================*/
-
-	add_filter( 'body_class', 'trestle_body_classes' );
-
-	/*===========================================
-	 * Header
-	===========================================*/
-
-	// Add logo
-	add_filter( 'genesis_seo_title', 'trestle_do_logos', 10, 3 );
-
-
-	/*===========================================
-	 * Auto & Mobile Navigation
-	===========================================*/	
-	
-	// Implement auto-nav and mobile nav button
-	add_action( 'init', 'trestle_nav_modifications' );
-
-
-	/*===========================================
-	 * Posts & Pages
-	===========================================*/
-
-	// Setup revisions number
-	add_filter( 'wp_revisions_to_keep', 'trestle_update_revisions_number', 10, 2 );
-
-	// Manually control where Post Info & Meta display
-	add_action( 'the_post', 'trestle_post_info_meta', 5 );
-
-	// Remove default featured image fallback of 'first-attached'
-	add_filter( 'genesis_get_image_default_args', 'trestle_featured_image_fallback' );
-
-
-	/*===========================================
-	 * General Actions & Filters
-	===========================================*/
-
-	// Do custom Read More text
-	add_filter( 'excerpt_more', 'trestle_read_more_link' );
-	add_filter( 'get_the_content_more_link', 'trestle_read_more_link' );
-	add_filter( 'the_content_more_link', 'trestle_read_more_link' );
-}
+}

includes/admin/admin.php

@@ -1,12 +1,13 @@
 <?php
 /**
- * Trestle admin functions
+ * Trestle admin functions.
  *
  * @since 1.0.0
  *
  * @package Trestle
  */
 
+add_action( 'admin_enqueue_scripts', 'trestle_admin_actions' );
 /**
  * Loads admin scripts and styles.
  *
@@ -14,15 +15,16 @@
  */
 function trestle_admin_actions() {
 	// Add admin jQuery
-	wp_enqueue_script( 'trestle-admin-jquery', get_stylesheet_directory_uri() . '/lib/admin/admin.js', array( 'jquery' ), '1.0.0', true );
+	wp_enqueue_script( 'trestle-admin-jquery', get_stylesheet_directory_uri() . '/includes/admin/admin.js', array( 'jquery' ), '1.0.0', true );
 
 	// Add admin jQuery
-	wp_enqueue_style( 'trestle-admin', get_stylesheet_directory_uri() . '/lib/admin/admin.css' );
+	wp_enqueue_style( 'trestle-admin', get_stylesheet_directory_uri() . '/includes/admin/admin.css' );
 
 	// Add admin CSS
-    add_editor_style( get_stylesheet_directory_uri() . '/lib/admin/editor-style.css' );
+    add_editor_style( get_stylesheet_directory_uri() . '/includes/admin/editor-style.css' );
 }
 
+add_filter( 'genesis_theme_settings_defaults', 'trestle_custom_defaults' );
 /**
  * Sets up Trestle default settings.
  *
@@ -34,15 +36,20 @@ function trestle_admin_actions() {
 function trestle_custom_defaults( $defaults ) {
  	// Trestle default key/value pairs
  	$trestle_defaults = array(
-		'trestle_layout' => 'solid',
-		'trestle_auto_nav' => 0,
-		'trestle_auto_nav_depth' => 0,
-		'trestle_include_home_link' => 0,
-		'trestle_home_link_text' => __( 'Home', 'trestle' ),
-		'trestle_nav_button_text' => '[icon name="icon-list-ul"]  ' . __( 'Navigation', 'trestle' ),
-		'trestle_read_more_text' => __( 'Read&nbsp;More&nbsp;&raquo;', 'trestle' ),
-		'trestle_revisions_number' => 3,
-		'trestle_equal_height_cols' => 1,
+		'trestle_layout'                => 'solid',
+		'trestle_logo_url'              => '',
+		'trestle_logo_url_mobile'       => '',
+		'trestle_favicon_url'           => '',
+		'trestle_nav_primary_location'  => 'full',
+		'trestle_auto_nav'              => 0,
+		'trestle_auto_nav_depth'        => 0,
+		'trestle_include_home_link'     => 0,
+		'trestle_home_link_text'        => __( 'Home', 'trestle' ),
+		'trestle_nav_button_text'       => '[icon name="icon-list-ul"]  ' . __( 'Navigation', 'trestle' ),
+		'trestle_read_more_text'        => __( 'Read&nbsp;More&nbsp;&raquo;', 'trestle' ),
+		'trestle_revisions_number'      => 3,
+		'trestle_footer_widgets_number' => 3,
+		'trestle_equal_height_cols'     => 1,
 		'trestle_equal_cols_breakpoint' => 768,
 	);
 
@@ -64,6 +71,7 @@ function trestle_custom_defaults( $defaults ) {
 	return $defaults;
 }
 
+add_action( 'genesis_settings_sanitizer_init', 'trestle_register_social_sanitization_filters' );
 /**
  * Adds sanitization for various Trestle admin settings.
  *
@@ -105,6 +113,7 @@ function trestle_register_social_sanitization_filters() {
 		GENESIS_SETTINGS_FIELD,
 		array(
 			'trestle_layout',
+			'trestle_nav_primary_location'
 		)
 	);
 
@@ -115,6 +124,7 @@ function trestle_register_social_sanitization_filters() {
 		array(
 			'trestle_logo_url',
 			'trestle_logo_url_mobile',
+			'trestle_favicon_url',
 			'trestle_home_link_text',
 			'trestle_nav_button_text',
 			'trestle_custom_nav_extras_text',
@@ -122,7 +132,8 @@ function trestle_register_social_sanitization_filters() {
 		)
 	);
 }
- 
+
+add_action( 'genesis_theme_settings_metaboxes', 'trestle_register_settings_box' );
 /**
  * Registers Trestle admin settings box.
  *
@@ -158,7 +169,7 @@ function trestle_settings_box() {
 		<input type="radio" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_layout]" value="bubble" <?php checked( esc_attr( genesis_get_option( 'trestle_layout' ) ), 'bubble' ); ?> />
 	</p>
 
-	<h4><?php _e( 'Header', 'trestle' ) ?></h4>
+	<h4><?php _e( 'Logos & Favicon', 'trestle' ) ?></h4>
 	<p>
 		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url]"><?php _e( 'Logo URL', 'trestle' ); ?></label><br />
 		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url]" value="<?php echo esc_attr( genesis_get_option( 'trestle_logo_url' ) ); ?>" />
@@ -167,13 +178,24 @@ function trestle_settings_box() {
 		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url_mobile]"><?php _e( 'Mobile Logo URL', 'trestle' ); ?></label><br />
 		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url_mobile]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_logo_url_mobile]" value="<?php echo esc_attr( genesis_get_option( 'trestle_logo_url_mobile' ) ); ?>" />
 	</p>
+	<p>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_favicon_url]"><?php _e( 'Favicon URL', 'trestle' ); ?></label><br />
+		<input class="widefat" type="text" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_favicon_url]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_favicon_url]" value="<?php echo esc_attr( genesis_get_option( 'trestle_favicon_url' ) ); ?>" />
+		<span class="description"><?php _e( 'Defaults to <i>/wp-content/themes/trestle/images/favicon.ico</i> if not specified.', 'trestle' ); ?></span>
+	</p>
 	
 	<h4><?php _e( 'Primary Navigation', 'trestle' ) ?></h4>
 	<p>
-		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_auto_nav' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]"><?php _e( 'Automatically generate nav menu', 'trestle' ); ?></label>
-		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav_depth]"><?php _e( 'with a depth of', 'trestle' ) ?>: </label>
+		<label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_primary_location]"><?php _e( 'Menu style:', 'trestle' ); ?> </label><br/>
+		<select name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_nav_primary_location]" />
+			<option value="full" <?php selected( esc_attr( genesis_get_option( 'trestle_nav_primary_location' ) ), 'full' ); ?> ><?php _e( 'Full width', 'trestle' ); ?></option>
+			<option value="header" <?php selected( esc_attr( genesis_get_option( 'trestle_nav_primary_location' ) ), 'header' ); ?> ><?php _e( 'Header right', 'trestle' ); ?></option>
+		</select>
+	</p>
+	<p>
+		<input type="checkbox" id="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]" value="1" <?php checked( esc_attr( genesis_get_option( 'trestle_auto_nav' ) ), 1); ?> /> <label for="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav]"><?php _e( 'Auto-generate primary navigation menu with published pages, to a depth of:', 'trestle' ); ?> </label>
 		<select name="<?php echo GENESIS_SETTINGS_FIELD; ?>[trestle_auto_nav_depth]" />
-			<option value="0" <?php selected( esc_attr( genesis_get_option( 'trestle_auto_nav_depth' ) ), '0' ); ?> >Unlimited</option>
+			<option value="0" <?php selected( esc_attr( genesis_get_option( 'trestle_auto_nav_depth' ) ), '0' ); ?> ><?php _e( 'Unlimited', 'trestle' ); ?></option>
 			<?php
 				for( $i=1; $i<=10; $i++ ) {
 					echo '<option value="' . $i . '" ' . selected( esc_attr( genesis_get_option( 'trestle_auto_nav_depth' ) ), $i, false ) . '>' . $i . '</option>' . "\n";
@@ -307,6 +329,7 @@ function trestle_settings_box() {
 	<?php
 }
 
+add_action( 'tgmpa_register', 'trestle_register_required_plugins' );
 /**
  * Loads required & recommended plugins.
  *
@@ -315,7 +338,7 @@ function trestle_settings_box() {
  *
  * @since 1.0.0
  *
- * @see tgmpa() in /lib/classes/class-tgm-plugin-activation.php
+ * @see tgmpa() in /includes/classes/class-tgm-plugin-activation.php
  */
 function trestle_register_required_plugins() {
 	$plugins = array(
@@ -358,8 +381,8 @@ function trestle_register_required_plugins() {
 		),
 
 		array(
-			'name' 		=> 'FancyBox for WordPress',
-			'slug' 		=> 'fancybox-for-wordpress',
+			'name' 		=> 'Easy Fancybox',
+			'slug' 		=> 'easy-fancybox',
 			'required'  => false,
 		),
 

includes/functions/theme-functions.php

@@ -10,33 +10,22 @@
  */
 
 /*===========================================
- * Widget Areas
-===========================================*/
-
-/**
- * Register custom widget areas
- *
- * @since 1.0.0
- */
-function trestle_register_widget_areas() {
-
-}
-
-/*===========================================
- * Head Styles & Scripts
+ * Header
 ===========================================*/
 
+add_action( 'wp_enqueue_scripts', 'trestle_header_actions' );
 /**
  * Loads theme scripts and styles.
  *
  * @since  1.0.0
  */
 function trestle_header_actions() {
+	
 	// Google fonts
 	wp_enqueue_style( 'theme-google-fonts', '//fonts.googleapis.com/css?family=Lato:300,400,700' );
 
 	// Theme jQuery
-	wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/lib/js/theme-jquery.js', array( 'jquery' ), CHILD_THEME_VERSION, true );
+	wp_enqueue_script( 'theme-jquery', get_stylesheet_directory_uri() . '/includes/js/theme-jquery.js', array( 'jquery' ), CHILD_THEME_VERSION, true );
 
 	// Get WP uploads directory
 	$upload_dir = wp_upload_dir();
@@ -57,14 +46,29 @@ function trestle_header_actions() {
 	$php_vars = array (
 		'trestle_equal_cols_breakpoint' => genesis_get_option( 'trestle_equal_cols_breakpoint' ),
 	);
-	wp_localize_script( 'theme-jquery', 'php_vars', $php_vars );
+	wp_localize_script( 'theme-jquery', 'trestle_vars', $php_vars );
+
 }
 
+add_filter( 'genesis_pre_load_favicon', 'trestle_do_custom_favicon' );
+/**
+ * Output custom favicon if specified in the theme options.
+ *
+ * @since   1.0.0
+ *
+ * @param   string  $favicon_url  Default favicon URL.
+ *
+ * @return  string  Custom favicon URL (if specified), or the default URL.
+ */
+function trestle_do_custom_favicon( $favicon_url ) {
+	return genesis_get_option( 'trestle_favicon_url' ) ? genesis_get_option( 'trestle_favicon_url' ) : $favicon_url;
+}
 
 /*===========================================
  * Body Classes
 ===========================================*/
 
+add_filter( 'body_class', 'trestle_body_classes' );
 /**
  * Adds custom classes to the <body> element for styling purposes.
  *
@@ -74,6 +78,7 @@ function trestle_header_actions() {
  * @return array 		 Updated body classes.
  */
 function trestle_body_classes( $classes ) {
+	
 	// Add 'no-jquery' class to be removed by jQuery if enabled
 	$classes[] = 'no-jquery';
 
@@ -91,6 +96,10 @@ function trestle_body_classes( $classes ) {
 	if ( genesis_get_option( 'trestle_doc_link_icons' ) )
 		$classes[] = 'doc-link-icons';
 
+	// Add menu style class
+	if ( genesis_get_option( 'trestle_nav_primary_location' ) )
+		$classes[] = 'nav-primary-location-' . esc_attr( genesis_get_option( 'trestle_nav_primary_location' ) );
+	
 	// Add footer widget number class
 	if ( genesis_get_option( 'trestle_footer_widgets_number' ) )
 		$classes[] = 'footer-widgets-number-' . esc_attr( genesis_get_option( 'trestle_footer_widgets_number' ) );
@@ -104,12 +113,15 @@ function trestle_body_classes( $classes ) {
 		$classes[] = 'has-logo';
 	
 	return $classes;
+
 }
 
+
 /*===========================================
  * Header
 ===========================================*/
 
+add_filter( 'genesis_seo_title', 'trestle_do_logos', 10, 3 );
 /**
  * Output logos.
  *
@@ -172,9 +184,10 @@ function trestle_do_logos( $title, $inside, $wrap ) {
 
 
 /*===========================================
- * Auto & Mobile Navigation
+ * Navigation
 ===========================================*/
 
+add_action( 'init', 'trestle_nav_modifications' );
 /**
  * Performs modifications to the primary navigation menu
  *
@@ -191,12 +204,10 @@ function trestle_nav_modifications() {
 	// Set title for Trestle placeholder navigation menu
 	$trestle_nav_title = __( 'Trestle Auto Nav Placeholder', 'trestle' );
 
-	// Add mobile nav button
-	add_action( 'genesis_after_header', 'trestle_add_mobile_nav', 0 );
-
 	// Auto-generate nav if Genesis theme setting is checked
-	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) )
+	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) ) {
 		add_filter( 'wp_nav_menu_items', 'trestle_auto_nav_items', 9, 2 );
+	}
 
 	// Do custom nav extras
 	if ( 1 == genesis_get_option( 'trestle_custom_nav_extras' ) ) {
@@ -211,15 +222,19 @@ function trestle_nav_modifications() {
 	trestle_nav_placeholder();
 }
 
+add_action( 'init', 'trestle_nav_primary_location' );
 /**
- * Adds button to open primary mobile navigation menu.
+ * Move primary navigation into the header if need be.
  *
- * @since 1.0.0
+ * @since  1.2.0
  */
-function trestle_add_mobile_nav() {
-	// Only add the button if there is a primary menu
-	if ( 1 == genesis_get_option( 'trestle_auto_nav' ) || has_nav_menu( 'primary' ) )
-		echo '<a id="menu-button" class="button" href="javascript:void(0)">' . do_shortcode( genesis_get_option( 'trestle_nav_button_text' ) ) . '</a>';
+function trestle_nav_primary_location() {
+
+	if ( 'header' == genesis_get_option( 'trestle_nav_primary_location' ) ) {
+		remove_action( 'genesis_after_header', 'genesis_do_nav' );
+		add_action( 'genesis_header', 'genesis_do_nav', 12 );
+	}
+
 }
 
 /**
@@ -312,6 +327,7 @@ function trestle_nav_placeholder() {
  * Posts & Pages
 ===========================================*/
 
+add_filter( 'wp_revisions_to_keep', 'trestle_update_revisions_number', 10, 2 );
 /**
  * Sets the number of post revisions. 
  *
@@ -329,6 +345,7 @@ function trestle_update_revisions_number( $num ) {
 	return $num;
 }
 
+add_action( 'the_post', 'trestle_post_info_meta', 5 );
 /**
  * Manually controls display of post info/meta for all post types.
  *
@@ -379,6 +396,7 @@ function trestle_post_info_meta() {
 	}
 }
 
+add_filter( 'genesis_get_image_default_args', 'trestle_featured_image_fallback' );
 /**
  * Unset Genesis default featured image fallback of 'first-attached'
  *
@@ -401,6 +419,9 @@ function trestle_featured_image_fallback( $args ) {
  * General Actions & Filters
 ===========================================*/
 
+add_filter( 'excerpt_more', 'trestle_read_more_link' );
+add_filter( 'get_the_content_more_link', 'trestle_read_more_link' );
+add_filter( 'the_content_more_link', 'trestle_read_more_link' );
 /**
  * Displays custom Trestle "read more" text in place of WordPress default.
  *
@@ -413,8 +434,9 @@ function trestle_read_more_link( $default_text ) {
 	// Get Trestle custom "read more" link text
 	$custom_text = esc_attr( genesis_get_option( 'trestle_read_more_text' ) );
 
-	if ( $custom_text )	
+	if ( $custom_text )	{
 		return '&hellip;&nbsp;<a class="more-link" title="' . $custom_text . '" href="' . get_permalink() . '">' . $custom_text . '</a>';
-	else
+	} else {
 		return $default_text;
-}
+	}
+}

includes/js/theme-jquery.js

@@ -0,0 +1,194 @@
+/**
+ * Trestle theme jQuery
+ *
+ * @since 1.0.0
+ *
+ * @package Trestle
+ */
+
+// Executes when the document is ready
+jQuery(document).ready(function( $ ) {
+
+	// Get PHP vars passed via wp_localize_script()
+	trestleEqualColsBreakpoint = trestle_vars.trestle_equal_cols_breakpoint;
+	trestleEqualHeightCols = trestle_vars.trestle_equal_height_cols;
+
+	// Remove .no-jquery body class
+	$('body').removeClass('no-jquery');
+	
+	// External Links
+	var h = window.location.host.toLowerCase();
+	$('[href^="http"]').not('[href*="' + h + '"]').addClass('external-link').attr("target", "_blank");
+
+	// Add classes to different types of links
+	$('a[href^="mailto:"]').addClass('email-link');
+	$('a[href*=".pdf"]').attr({"target":"_blank"}).addClass('pdf-link');
+	$('a[href*=".doc"]').attr({"target":"_blank"}).addClass('doc-link');
+	$('a').has('img').addClass('image-link');
+
+	// Add classes to parts of lists
+	$('li:last-child').addClass('last');
+	$('li:first-child').addClass('first');
+	$('ul, ol').parent('li').addClass('parent');
+
+	// Mobile header toggle buttons
+	$('.site-header .title-area').after('<div class="toggle-buttons" />');
+	$('.site-header .widget-area, .nav-primary').each(function(i) {
+		var target = $(this);
+
+		var buttonClass = 'toggle-button';
+
+        // Add classes of target element
+        var targetClass = target.attr('class').split(/\s+/);
+        $.each(targetClass, function(index,value) {
+        	buttonClass += ' targets-' + value;
+        });
+        
+        if ( $(this).is( 'nav' ) ) {
+        	buttonClass += ' nav-toggle';
+        }
+
+        // Add toggle buttons to header
+        $('.toggle-buttons').prepend('<a id="toggle-button-' + i + '" class="' + buttonClass + '" href="#">Toggle</a>');
+
+        // Add target class to nav and widget areas
+        target.addClass('toggle-target-' + i );
+    });
+	
+    // Toggle widget areas and primary nav
+    $('.site-header .toggle-button').click( function( event ) {
+    	
+        // Prevent default behavior
+        event.preventDefault();
+
+        // Get toggle button that was clicked
+    	var button = $(this);
+
+        // Remove focus
+        button.blur();
+
+    	var target = $( '.toggle-target-' + button.attr('id').match(/\d+/) );
+
+        // Toggle buttons
+        button.toggleClass('open');
+        $('.site-header .toggle-button').not(button).removeClass('open');
+
+        // Toggle targets
+        target.toggleClass('open');
+        $('[class*="toggle-target"]').not(target).removeClass('open');
+
+    });
+
+    // Mobile navigation icons
+    var closedIcon = '+';
+    var openIcon = '-';
+
+    $('.nav-primary').find('.genesis-nav-menu .parent:not(.current-menu-item, .current_page_item, .current_page_parent, .current_page_ancestor) > a').after('<a class="sub-icon" href="#">' + closedIcon + '</a>');
+    $('.nav-primary').find('.genesis-nav-menu .parent.current-menu-item > a, .genesis-nav-menu .parent.current_page_item > a, .genesis-nav-menu .parent.current_page_parent > a, .genesis-nav-menu .parent.current_page_ancestor > a').after('<a class="sub-icon" href="#">' + openIcon + '</a>');
+    
+    // Mobile navigation expand/contract functionality
+    $('.sub-icon').click(function(event) {
+    	
+        // Prevent default behavior
+        event.preventDefault();
+    	
+        // Get icon clicked
+        var icon = $(this);
+
+        // Remove focus
+        icon.blur();
+
+    	icon.next('ul').slideToggle().toggleClass('open');
+    	if ( icon.text().indexOf( closedIcon ) !== -1 )
+    		icon.text(openIcon);
+    	else if ( icon.text().indexOf( openIcon ) !== -1 )
+    		icon.text(closedIcon);
+    });
+    
+    $('.widget-area-toggle').click(function(event) {
+    	
+        // Prevent default behavior
+        event.preventDefault();
+
+        // Get button clicked
+    	var button = $(this);
+
+        // Remove focus
+        button.blur();
+
+    	button.toggleClass('open');
+    	button.next('.widget-area').slideToggle();
+    });
+
+	// Equal height homepage cols
+	$('.equal-height-genesis-extender-cols .ez-home-container-area').each(function() {
+		$(this).children('.widget-area').equalHeights(null,null,trestleEqualColsBreakpoint);
+	});
+
+	
+}); /* end of as page load scripts */
+
+
+// Executes when complete page is fully loaded, including all frames, objects, and images
+jQuery(window).load(function( $ ) {
+
+});
+
+
+/**
+ * Equal Heights Plugin
+ * 
+ * Equalize the heights of elements. Great for columns or any elements
+ * that need to be the same size (floats, etc).
+ *
+ * Based on Rob Glazebrook's (cssnewbie.com) script
+ *
+ * Additions
+ *  - ability to include a break point (the minimum viewport width at which the script does anything)
+ *  - binds the script to run on load, orientation change (for mobile), and when resizing the window
+ *
+ * Usage: jQuery(object).equalHeights([minHeight], [maxHeight], [breakPoint]);
+ * 
+ * Example 1: jQuery(".cols").equalHeights(); Sets all columns to the same height.
+ * Example 2: jQuery(".cols").equalHeights(400); Sets all cols to at least 400px tall.
+ * Example 3: jQuery(".cols").equalHeights(100,300); Cols are at least 100 but no more
+ * than 300 pixels tall. Elements with too much content will gain a scrollbar.
+ * Example 4: jQuery(".cols").equalHeights(null, null,768); Only resize columns above 768px viewport
+ * 
+ */
+ (function( $ ) {
+ 	$.fn.equalHeights = function(minHeight, maxHeight, breakPoint) {
+ 		var items = this;
+ 		breakPoint = breakPoint || 0;
+
+         // Bind functionality to appropriate events
+         $(window).on('load orientationchange resize equalheights', function() {
+         	tallest = (minHeight) ? minHeight : 0;
+         	items.each(function() {
+         		$(this).height('auto');
+         		if($(this).outerHeight() > tallest) {
+         			tallest = $(this).outerHeight();
+         		}
+         	});
+
+             // Get viewport width (taking scrollbars into account)
+             var e = window;
+             a = 'inner';
+             if (!('innerWidth' in window )) {
+             	a = 'client';
+             	e = document.documentElement || document.body;
+             }
+             width = e[ a+'Width' ];
+
+             // Equalize column heights if above the specified breakpoint
+             if ( width >= breakPoint ) {
+             	if((maxHeight) && tallest > maxHeight) tallest = maxHeight;
+             	console.log(tallest);
+             	return items.each(function() {
+             		$(this).height(tallest);
+             	});
+             }
+         });
+     }
+
+ })(jQuery);

includes/shortcodes/shortcodes.php

@@ -0,0 +1,142 @@
+<?php 
+/**
+ * Trestle shortcodes
+ *
+ * @since 1.0.0
+ *
+ * @package Trestle
+ */
+
+/*===========================================
+ * Shortcodes
+===========================================*/
+
+add_filter('the_content', 'trestle_shortcode_empty_paragraph_fix');
+/**
+ * Fix for empty <p> tags around shortcodes
+ *
+ * @since  1.0.0
+ *
+ * @param   string  $content  HTML content.
+ *
+ * @return  string            Updated content.
+ */
+function trestle_shortcode_empty_paragraph_fix( $content )
+{   
+    $array = array (
+        '<p>[' => '[', 
+        ']</p>' => ']', 
+        ']<br />' => ']'
+        );
+
+    $content = strtr($content, $array);
+
+    return $content;
+}
+
+add_shortcode( 'col', 'trestle_column' );
+/**
+ * Columns
+ * 
+ * Example:
+ * [col class="one-half first no-list-margin"] Contents [/col]
+ *
+ * Classes:
+ *     - width (one-half, one-third, etc - uses native Genesis column classes in style.css)
+ *     - first (used to specify the first column in a row)
+ *     - no-list-margin (will cause contained list elements to collapse as one on mobile sizes)
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function trestle_column( $atts, $content = null ) {
+    extract( shortcode_atts( array(
+        'class' => '',
+        ), $atts ) );
+    return '<div class="col ' . $class . '">' . do_shortcode( $content ) . '</div>';
+}
+
+
+
+add_shortcode( 'button', 'trestle_button' );
+/**
+ * Button
+ * 
+ * Example: [button href="url" title="title" target="target" class="class"]Text[/button]
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function trestle_button( $atts, $content = null ) {
+    extract( shortcode_atts( array(
+        'href' => '#',
+        'target' => '',
+        'title' => '',
+        'class' => '',
+        ), $atts ) );
+    return '<a class="button ' . $class . '" href="' . $href . '" title="' . $title . '" target="' . $target . '">' . do_shortcode( $content ) . '</a>';
+}
+
+
+add_shortcode( 'date', 'trestle_date' );
+/**
+ * Date
+ *
+ * Example: [date format="M d, Y"]
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function trestle_date( $atts ) {
+    extract( shortcode_atts( array(
+        'format' => 'M d, Y',
+    ), $format ) );
+
+    if ( ! $format ) {
+        $format = 'M d, Y'; 
+    }
+
+    return date( $format );
+}
+
+add_shortcode( 'blockquote', 'igg_blockquote_shortcode' );
+/**
+ * Blockquote
+ * 
+ * Example: [blockquote citation=""]Content[/blockquote]
+ *
+ * @since   1.2.0
+ *
+ * @param   array  $atts  Shortcode attributes.
+ *
+ * @return  string        Shortcode output.
+ */
+function igg_blockquote_shortcode( $atts, $content = null ) {
+         
+   $atts = shortcode_atts( array(
+      'citation'      => '',
+   ), $atts );
+         
+   ob_start(); ?>
+   
+   <blockquote>
+   
+   <?php if ( $content ) : ?>
+      <?php echo $content; ?>
+   <?php endif; ?>
+   
+   <?php if ( $atts['citation'] ) : ?>
+      <cite>- <?php echo $atts['citation']; ?></cite>
+   <?php endif; ?>
+
+   </blockquote>
+   
+   <?php
+   
+   $output = ob_get_clean();
+
+   return $output;
+}

includes/widget-areas/widget-areas.php

@@ -0,0 +1,36 @@
+<?php
+
+/**
+ * Trestle widget area registration and functionality
+ *  
+ * @since  1.0.0
+ * 
+ * @package Trestle
+ */
+
+//add_action( 'widgets_init', 'trestle_register_widget_areas' );
+/**
+ * Register custom widget areas
+ *
+ * @since 1.0.0
+ */
+function trestle_register_widget_areas() {
+	genesis_register_widget_area( array(
+		'id'            => 'sample-widget-area',
+		'name'          => __( 'Sample Widget Area', 'trestle' ),
+		'description'   => __( 'This is the sample widget area', 'trestle' ),
+	) );
+}
+
+//add_action( 'genesis_header', 'trestle_output_sample_widget_area' );
+/**
+ * Output sample widget area.
+ *
+ * @since  1.2.0
+ */
+function trestle_output_sample_widget_area() {
+	genesis_widget_area( 'sample-widget-area', array(
+		'before' => '<aside class="sample-widget-area widget-area">',
+		'after' => '</aside>',
+	) );
+}

languages/trestle.pot

@@ -15,334 +15,334 @@ msgstr ""
 "X-Poedit-KeywordsList: __;_e;_x;_n\n"
 "X-Poedit-SearchPath-0: ..\n"
 
-#: ../lib/admin/admin-functions.php:38
+#: ../includes/admin/admin-functions.php:38
 msgid "Navigation"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:39
+#: ../includes/admin/admin-functions.php:39
 msgid "Read More »"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:121
+#: ../includes/admin/admin-functions.php:121
 msgid "Trestle Settings <small>by</small>"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:135
+#: ../includes/admin/admin-functions.php:135
 msgid "Layout"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:143
+#: ../includes/admin/admin-functions.php:143
 msgid "Primary Navigation"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:145
+#: ../includes/admin/admin-functions.php:145
 msgid ""
 "Automatically generate nav menu (replaces custom/manual menu with auto-"
 "generated menu)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:146
+#: ../includes/admin/admin-functions.php:146
 msgid "Include home link"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:149
+#: ../includes/admin/admin-functions.php:149
 msgid "Text for mobile navigation button (shortcodes can be included):"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:153
+#: ../includes/admin/admin-functions.php:153
 msgid "Primary Navigation Extras"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:154
+#: ../includes/admin/admin-functions.php:154
 msgid ""
 "Display custom navigation extras content (overrides standard Genesis "
 "navigation extras)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:156
+#: ../includes/admin/admin-functions.php:156
 msgid "Custom navigation extras text:"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:160
+#: ../includes/admin/admin-functions.php:160
 msgid "Blog/Posts"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:162
+#: ../includes/admin/admin-functions.php:162
 msgid "Custom read more link text"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:165
+#: ../includes/admin/admin-functions.php:165
 msgid "Number of post revisions"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:176
+#: ../includes/admin/admin-functions.php:176
 msgid "Post Info & Meta"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:177
+#: ../includes/admin/admin-functions.php:177
 msgid "Manually select where to show Post Info & Meta"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:180
+#: ../includes/admin/admin-functions.php:180
 msgid "Show Post Info on:"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:190 ../lib/admin/admin-functions.php:210
+#: ../includes/admin/admin-functions.php:190 ../includes/admin/admin-functions.php:210
 #, php-format
 msgid "%s (single)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:193 ../lib/admin/admin-functions.php:213
+#: ../includes/admin/admin-functions.php:193 ../includes/admin/admin-functions.php:213
 #, php-format
 msgid "%s (archive)"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:200
+#: ../includes/admin/admin-functions.php:200
 msgid "Show Post Meta on:"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:221
+#: ../includes/admin/admin-functions.php:221
 msgid "Footer Widgets"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:223
+#: ../includes/admin/admin-functions.php:223
 msgid "Number"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:233
+#: ../includes/admin/admin-functions.php:233
 msgid "Link Icons"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:235
+#: ../includes/admin/admin-functions.php:235
 msgid "Add icons to external links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:236
+#: ../includes/admin/admin-functions.php:236
 msgid "Add icons to email links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:237
+#: ../includes/admin/admin-functions.php:237
 msgid "Add icons to .pdf links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:238
+#: ../includes/admin/admin-functions.php:238
 msgid "Add icons to .doc links"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:398
-#: ../lib/classes/class-tgm-plugin-activation.php:155
+#: ../includes/admin/admin-functions.php:398
+#: ../includes/classes/class-tgm-plugin-activation.php:155
 msgid "Install Required Plugins"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:399
-#: ../lib/classes/class-tgm-plugin-activation.php:156
+#: ../includes/admin/admin-functions.php:399
+#: ../includes/classes/class-tgm-plugin-activation.php:156
 msgid "Install Plugins"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:400
-#: ../lib/classes/class-tgm-plugin-activation.php:157
+#: ../includes/admin/admin-functions.php:400
+#: ../includes/classes/class-tgm-plugin-activation.php:157
 #, php-format
 msgid "Installing Plugin: %s"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:401
+#: ../includes/admin/admin-functions.php:401
 msgid "Something went wrong with the plugin API."
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:412
-#: ../lib/classes/class-tgm-plugin-activation.php:169
+#: ../includes/admin/admin-functions.php:412
+#: ../includes/classes/class-tgm-plugin-activation.php:169
 msgid "Return to Required Plugins Installer"
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:413
-#: ../lib/classes/class-tgm-plugin-activation.php:171
-#: ../lib/classes/class-tgm-plugin-activation.php:1840
+#: ../includes/admin/admin-functions.php:413
+#: ../includes/classes/class-tgm-plugin-activation.php:171
+#: ../includes/classes/class-tgm-plugin-activation.php:1840
 msgid "Plugin activated successfully."
 msgstr ""
 
-#: ../lib/admin/admin-functions.php:414
+#: ../includes/admin/admin-functions.php:414
 #, php-format
 msgid "All plugins installed and activated successfully. %s"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:158
+#: ../includes/classes/class-tgm-plugin-activation.php:158
 msgid "Something went wrong."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:170
+#: ../includes/classes/class-tgm-plugin-activation.php:170
 msgid "Return to the dashboard"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:172
-#: ../lib/classes/class-tgm-plugin-activation.php:1538
+#: ../includes/classes/class-tgm-plugin-activation.php:172
+#: ../includes/classes/class-tgm-plugin-activation.php:1538
 msgid "The following plugin was activated successfully:"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:173
+#: ../includes/classes/class-tgm-plugin-activation.php:173
 #, php-format
 msgid "All plugins installed and activated successfully. %1$s"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:174
+#: ../includes/classes/class-tgm-plugin-activation.php:174
 msgid "Dismiss this notice"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1085
+#: ../includes/classes/class-tgm-plugin-activation.php:1085
 msgid "External Link"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1090
+#: ../includes/classes/class-tgm-plugin-activation.php:1090
 msgid "Private Repository"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1093
+#: ../includes/classes/class-tgm-plugin-activation.php:1093
 msgid "Pre-Packaged"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1097
+#: ../includes/classes/class-tgm-plugin-activation.php:1097
 msgid "WordPress Repository"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1100
+#: ../includes/classes/class-tgm-plugin-activation.php:1100
 msgid "Required"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1100
+#: ../includes/classes/class-tgm-plugin-activation.php:1100
 msgid "Recommended"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1103
+#: ../includes/classes/class-tgm-plugin-activation.php:1103
 msgid "Not Installed"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1105
+#: ../includes/classes/class-tgm-plugin-activation.php:1105
 msgid "Installed But Not Activated"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1275
+#: ../includes/classes/class-tgm-plugin-activation.php:1275
 #, php-format
 msgid ""
 "No plugins to install or activate. <a href=\"%1$s\" title=\"Return to the "
 "Dashboard\">Return to the Dashboard</a>"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1291
+#: ../includes/classes/class-tgm-plugin-activation.php:1291
 msgid "Plugin"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1292
+#: ../includes/classes/class-tgm-plugin-activation.php:1292
 msgid "Source"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1293
+#: ../includes/classes/class-tgm-plugin-activation.php:1293
 msgid "Type"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1294
+#: ../includes/classes/class-tgm-plugin-activation.php:1294
 msgid "Status"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1312
+#: ../includes/classes/class-tgm-plugin-activation.php:1312
 msgid "Install"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1313
+#: ../includes/classes/class-tgm-plugin-activation.php:1313
 msgid "Activate"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1823
+#: ../includes/classes/class-tgm-plugin-activation.php:1823
 msgid "Install package not available."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1824
+#: ../includes/classes/class-tgm-plugin-activation.php:1824
 #, php-format
 msgid "Downloading install package from <span class=\"code\">%s</span>&#8230;"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1825
+#: ../includes/classes/class-tgm-plugin-activation.php:1825
 msgid "Unpacking the package&#8230;"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1826
+#: ../includes/classes/class-tgm-plugin-activation.php:1826
 msgid "Installing the plugin&#8230;"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1827
+#: ../includes/classes/class-tgm-plugin-activation.php:1827
 msgid "Plugin install failed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1828
+#: ../includes/classes/class-tgm-plugin-activation.php:1828
 msgid "Plugin installed successfully."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1839
+#: ../includes/classes/class-tgm-plugin-activation.php:1839
 msgid "Plugin activation failed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1949
+#: ../includes/classes/class-tgm-plugin-activation.php:1949
 msgid ""
 "The installation and activation process is starting. This process may take a "
 "while on some hosts, so please be patient."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1950
+#: ../includes/classes/class-tgm-plugin-activation.php:1950
 #, php-format
 msgid "%1$s installed and activated successfully."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1950
-#: ../lib/classes/class-tgm-plugin-activation.php:1959
+#: ../includes/classes/class-tgm-plugin-activation.php:1950
+#: ../includes/classes/class-tgm-plugin-activation.php:1959
 msgid "Show Details"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1950
-#: ../lib/classes/class-tgm-plugin-activation.php:1959
+#: ../includes/classes/class-tgm-plugin-activation.php:1950
+#: ../includes/classes/class-tgm-plugin-activation.php:1959
 msgid "Hide Details"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1951
+#: ../includes/classes/class-tgm-plugin-activation.php:1951
 msgid "All installations and activations have been completed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1952
+#: ../includes/classes/class-tgm-plugin-activation.php:1952
 #, php-format
 msgid "Installing and Activating Plugin %1$s (%2$d/%3$d)"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1956
+#: ../includes/classes/class-tgm-plugin-activation.php:1956
 msgid ""
 "The installation process is starting. This process may take a while on some "
 "hosts, so please be patient."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1957
+#: ../includes/classes/class-tgm-plugin-activation.php:1957
 #, php-format
 msgid "An error occurred while installing %1$s: <strong>%2$s</strong>."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1958
+#: ../includes/classes/class-tgm-plugin-activation.php:1958
 #, php-format
 msgid "The installation of %1$s failed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1959
+#: ../includes/classes/class-tgm-plugin-activation.php:1959
 #, php-format
 msgid "%1$s installed successfully."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1960
+#: ../includes/classes/class-tgm-plugin-activation.php:1960
 msgid "All installations have been completed."
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:1961
+#: ../includes/classes/class-tgm-plugin-activation.php:1961
 #, php-format
 msgid "Installing Plugin %1$s (%2$d/%3$d)"
 msgstr ""
 
-#: ../lib/classes/class-tgm-plugin-activation.php:2052
+#: ../includes/classes/class-tgm-plugin-activation.php:2052
 msgid "Return to the Dashboard"
 msgstr ""
 
-#: ../lib/functions/theme-functions.php:136
+#: ../includes/functions/theme-functions.php:136
 msgid "Trestle Auto Nav Placeholder"
 msgstr ""

lib/admin/admin.php

@@ -1,26 +0,0 @@
-<?php
-/**
- * Trestle admin functionality
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-// Require admin functions
-require_once dirname( __FILE__ ) . '/admin-functions.php';
-
-// Trestle admin scripts and styles
-add_action( 'admin_enqueue_scripts', 'trestle_admin_actions' );
-
-// Trestle default settings
-add_filter( 'genesis_theme_settings_defaults', 'trestle_custom_defaults' );
-
-// Sanitize settings
-add_action( 'genesis_settings_sanitizer_init', 'trestle_register_social_sanitization_filters' );
- 
-// Register Trestle settings metabox
-add_action( 'genesis_theme_settings_metaboxes', 'trestle_register_settings_box' );
-
-// Required & recommended plugins
-add_action( 'tgmpa_register', 'trestle_register_required_plugins' );

lib/js/theme-jquery.js

@@ -1,129 +0,0 @@
-/**
- * Trestle theme jQuery
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-// Executes when the document is ready
-jQuery(document).ready(function() {
-
-	// Get PHP vars passed via wp_localize_script()
-	trestleEqualColsBreakpoint = php_vars.trestle_equal_cols_breakpoint;
-	trestleEqualHeightCols = php_vars.trestle_equal_height_cols
-
-	// Remove .no-jquery body class
-	jQuery('body').removeClass('no-jquery');
-	
-	// External Links
-	var h = window.location.host.toLowerCase();
-	jQuery('[href^="http"]').not('[href*="' + h + '"]').addClass('external-link').attr("target", "_blank");
-
-	// Add classes to different types of links
-	jQuery('a[href^="mailto:"]').addClass('email-link');
-	jQuery('a[href*=".pdf"]').attr({"target":"_blank"}).addClass('pdf-link');
-	jQuery('a[href*=".doc"]').attr({"target":"_blank"}).addClass('doc-link');
-	jQuery('a').has('img').addClass('image-link');
-
-	// Add classes to parts of lists
-	jQuery('li:last-child').addClass('last');
-	jQuery('li:first-child').addClass('first');
-	jQuery('ul, ol').parent('li').addClass('parent');
-
-	// Mobile navigation button
-	jQuery('#menu-button').click(function() {
-		var button = jQuery(this);
-		button.toggleClass('open');
-        jQuery('.nav-primary').slideToggle();
-    });
-
-    // Mobile navigation icons
-    var closedIcon = '+';
-    var openIcon = '-';
-
-    jQuery('.nav-primary').find('.genesis-nav-menu .parent:not(.current-menu-item, .current_page_item, .current_page_parent, .current_page_ancestor) > a').after('<a class="sub-icon" href="javascript:void()">' + closedIcon + '</a>');
-    jQuery('.nav-primary').find('.genesis-nav-menu .parent.current-menu-item > a, .genesis-nav-menu .parent.current_page_item > a, .genesis-nav-menu .parent.current_page_parent > a, .genesis-nav-menu .parent.current_page_ancestor > a').after('<a class="sub-icon" href="javscript: void()">' + openIcon + '</a>');
-    
-    // Mobile navigation expand/contract functionality
-    jQuery('.sub-icon').click(function() {
-		var icon = jQuery(this);
-		icon.next('ul').slideToggle().toggleClass('open');
-		if ( icon.text().indexOf( closedIcon ) !== -1 )
-			icon.text(openIcon);
-		else if ( icon.text().indexOf( openIcon ) !== -1 )
-			icon.text(closedIcon);
-    });
-
-	// Equal height homepage cols
-    jQuery('.equal-height-genesis-extender-cols .ez-home-container-area').each(function() {
-    	jQuery(this).children('.widget-area').equalHeights(null,null,trestleEqualColsBreakpoint);
-    });
-
-    
-}); /* end of as page load scripts */
-
-
-// Executes when complete page is fully loaded, including all frames, objects, and images
-jQuery(window).load(function() {
-
-});
-
-
-/**
- * Equal Heights Plugin
- * 
- * Equalize the heights of elements. Great for columns or any elements
- * that need to be the same size (floats, etc).
- *
- * Based on Rob Glazebrook's (cssnewbie.com) script
- *
- * Additions
- *  - ability to include a break point (the minimum viewport width at which the script does anything)
- *  - binds the script to run on load, orientation change (for mobile), and when resizing the window
- *
- * Usage: jQuery(object).equalHeights([minHeight], [maxHeight], [breakPoint]);
- * 
- * Example 1: jQuery(".cols").equalHeights(); Sets all columns to the same height.
- * Example 2: jQuery(".cols").equalHeights(400); Sets all cols to at least 400px tall.
- * Example 3: jQuery(".cols").equalHeights(100,300); Cols are at least 100 but no more
- * than 300 pixels tall. Elements with too much content will gain a scrollbar.
- * Example 4: jQuery(".cols").equalHeights(null, null,768); Only resize columns above 768px viewport
- * 
- */
-(function(jQuery) {
-     jQuery.fn.equalHeights = function(minHeight, maxHeight, breakPoint) {
-         var items = this;
-         breakPoint = breakPoint || 0;
- 
-         // Bind functionality to appropriate events
-         jQuery(window).bind('load orientationchange resize', function() {
-             tallest = (minHeight) ? minHeight : 0;
-             items.each(function() {
-                 jQuery(this).height('auto');
-                 if(jQuery(this).outerHeight() > tallest) {
-                     tallest = jQuery(this).outerHeight();
-                 }
-             });
- 
-             // Get viewport width (taking scrollbars into account)
-             var e = window;
-             a = 'inner';
-             if (!('innerWidth' in window )) {
-                 a = 'client';
-                 e = document.documentElement || document.body;
-             }
-             width = e[ a+'Width' ];
- 
-             // Equalize column heights if above the specified breakpoint
-             if ( width >= breakPoint ) {
-                 if((maxHeight) && tallest > maxHeight) tallest = maxHeight;
-                 console.log(tallest);
-                 return items.each(function() {
-                     jQuery(this).height(tallest);
-                 });
-             }
-         });
-     }
- 
- })(jQuery);

lib/shortcodes/shortcodes.php

@@ -1,55 +0,0 @@
-<?php 
-/**
- * Trestle shortcodes
- *
- * @since 1.0.0
- *
- * @package Trestle
- */
-
-/*===========================================
- * Shortcodes
-===========================================*/
-
-// Fix for empty <p> tags around shortcodes
-function trestle_shortcode_empty_paragraph_fix($content)
-{   
-    $array = array (
-        '<p>[' => '[', 
-        ']</p>' => ']', 
-        ']<br />' => ']'
-    );
-
-    $content = strtr($content, $array);
-
-    return $content;
-}
-add_filter('the_content', 'trestle_shortcode_empty_paragraph_fix');
-
-/**
- * Columns - [col class="one-half first no-list-margin"] Contents [/col]
- *
- * Classes:
- *     - width (one-half, one-third, etc - uses native Genesis column classes in style.css)
- *     - first (used to specify the first column in a row)
- *     - no-list-margin (will cause contained list elements to collapse as one on mobile sizes)
- */
-function trestle_column( $atts, $content = null ) {
-    extract( shortcode_atts( array(
-        'class' => '',
-    ), $atts ) );
-    return '<div class="col ' . $class . '">' . do_shortcode( $content ) . '</div>';
-}
-add_shortcode( 'col', 'trestle_column' );
-
-/**
- * Buttons - [button href="url" class="class"]Text[/button]
- */
-function trestle_button( $atts, $content = null ) {
-    extract( shortcode_atts( array(
-        'href' => '#',
-        'class' => '',
-    ), $atts ) );
-    return '<a class="button ' . $class . '" href="' . $href . '">' . do_shortcode( $content ) . '</a>';
-}
-add_shortcode( 'button', 'trestle_button' );

lib/sidebars/sidebars.php

@@ -1,9 +0,0 @@
-<?php
-
-/**
- * Trestle sidebar registration and functionality
- *  
- * @since  1.0.0
- * 
- * @package Trestle
- */

page_archive_all_pages.php

@@ -0,0 +1,67 @@
+<?php
+/**
+ * Genesis Framework.
+ *
+ * WARNING: This file is part of the core Genesis Framework. DO NOT edit this file under any circumstances.
+ * Please do all modifications in the form of a child theme.
+ *
+ * @package Genesis\Templates
+ * @author  StudioPress
+ * @license GPL-2.0+
+ * @link    http://my.studiopress.com/themes/genesis/
+ */
+
+//* Template Name: Archive - All Pages
+
+//* Remove standard post content output
+remove_action( 'genesis_post_content', 'genesis_do_post_content' );
+remove_action( 'genesis_entry_content', 'genesis_do_post_content' );
+
+add_action( 'genesis_entry_content', 'genesis_page_archive_content' );
+add_action( 'genesis_post_content', 'genesis_page_archive_content' );
+/**
+ * This function outputs sitemap-esque columns displaying all pages,
+ * categories, authors, monthly archives, and recent posts.
+ *
+ * @since 1.6
+ */
+function genesis_page_archive_content() { 
+
+	// Pause Exclude Pages plugin functionality.
+	pause_exclude_pages();
+	
+	?>
+	
+	<h4><?php _e( 'Pages:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_list_pages( 'title_li=' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Categories:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_list_categories( 'sort_column=name&title_li=' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Authors:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_list_authors( 'exclude_admin=0&optioncount=1' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Monthly:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_get_archives( 'type=monthly' ); ?>
+	</ul>
+
+	<h4><?php _e( 'Recent Posts:', 'genesis' ); ?></h4>
+	<ul>
+		<?php wp_get_archives( 'type=postbypost&limit=100' ); ?>
+	</ul>
+
+	<?php
+
+	// Resume Exclude Pages plugin functionality.
+	resume_exclude_pages();
+
+}
+
+genesis();

style.css

@@ -5,9 +5,10 @@
 	Description: Trestle is a Genesis child theme for developers based on the default <a href="http://www.genesisframework.com/">Genesis 2.0 Sample Theme</a>. It features mobile first CSS, helpful theme options, and lots more tools to support your development process.
 	Author: MIGHTYminnow
 	Author URI: http://www.mightyminnow.com/
-	Version: 1.0.0
+	Version: 1.1.0
 	Tags: black, gray, red, white, light, one-column, two-columns, three-columns, left-sidebar, right-sidebar, fluid-layout, responsive-layout, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-images, flexible-header, front-page-post-form, full-width-template, post-formats, rtl-language-support, sticky-post, theme-options, threaded-comments, translation-ready, genesis, mobile-first, responsive, clean
 	Text Domain: trestle
+	GitHub Theme URI: mickeykay/trestle
 */
 
 /* Table of Contents
@@ -169,11 +170,14 @@ input[type="reset"]:focus,
 input[type="submit"]:focus,
 textarea:focus,
 .button {
+	outline: none;
+
 	-webkit-transition: all 0.1s ease-in-out;
 	-moz-transition:    all 0.1s ease-in-out;
 	-ms-transition:     all 0.1s ease-in-out;
 	-o-transition:      all 0.1s ease-in-out;
 	transition:         all 0.1s ease-in-out;
+	
 	-webkit-appearance: none;
 	-moz-appearance: none;
 }
@@ -216,6 +220,10 @@ ul {
 	margin-bottom: 2.6rem;
 }
 
+.content li {
+	margin-bottom: 0.5em;
+}
+
 .content ul li {
 	list-style-type: disc;
 }
@@ -254,8 +262,17 @@ blockquote::before {
 
 blockquote cite {
 	display: block;
-	margin-right: 10%;
-	text-align: right;
+	margin-top: 0.5em;
+	margin-left: 60%;
+}
+
+blockquote cite i,
+blockquote cite em {
+	display: block;
+	color: #959594;
+	font-size: 0.8em;
+	font-weight: normal;
+	font-style: italic;
 }
 
 .content code {
@@ -293,39 +310,39 @@ a:hover {
 	border: none;
 }
 
-a img {
-	margin-bottom: -4px;
-	margin-bottom: -0.4rem;
+.external-link-icons .external-link:after,
+.email-link-icons .email-link:before,
+.pdf-link-icons .pdf-link:before,
+.doc-link-icons .doc-link:before {
+	margin: 0 4px;
+	white-space: nowrap;
+	font-family: FontAwesome;
 }
 
 .external-link-icons .external-link:after {
-	content: url(images/external.png);
-	margin: 0 0 0 4px;
-	white-space: nowrap;
+	content: "\f08e";
+}
+
+.email-link-icons .email-link:before {
+	content: "\f003";
+}
+
+.pdf-link-icons .pdf-link:before {
+	content: "\f1c1";
+}
+
+.pdf-link-icons .pdf-link:after {
+	display: none;
+}
+
+.doc-link-icons .doc-link:before {
+	content: "\f1c2";
 }
 
 .menu .external-link:after {
 	display: none;
 }
 
-.email-link-icons .email-link:before {
-	content: url(images/email.png);
-	margin: 0 4px 0 0;
-	white-space: nowrap;
-}
-
-.pdf-link-icons .pdf-link:before {
-	content: url(images/pdf.png);
-	margin: 0 4px 0 0;
-	white-space: nowrap;
-}
-
-.doc-link-icons .doc-link:before {
-	content: url(images/doc.png);
-	margin: 0 4px 0 0;
-	white-space: nowrap;
-}
-
 .image-link,
 .image-link:hover {
 	border-bottom: none !important;
@@ -410,6 +427,10 @@ img {
 	width: auto; /* IE8 */
 }
 
+.wp-caption img {
+	display: block;
+}
+
 /* Forms & Buttons
 --------------------------------------------- */
 
@@ -494,7 +515,7 @@ input:hover[type="button"],
 input:hover[type="reset"],
 input:hover[type="submit"],
 body .button:hover,
-.genesis-nav-menu input[type="submit"] {
+	.genesis-nav-menu input[type="submit"] {
 	background-color: #f15123;
 	border-color: #f15123;
 	color: #fff;
@@ -516,11 +537,6 @@ body .button:hover,
 
 /* Sidebar Forms, Buttons, & Inputs */
 
-.sidebar input,
-.sidebar select,
-.sidebar textarea,
-.sidebar button,
-.sidebar .button,
 .sidebar #subscribe-email input, /* Begin Jetpack - Blog Subscription */
 .sidebar div.gform_wrapper input[type="email"], /* Begin Gravity Forms */
 .sidebar div.gform_wrapper input[type="text"],
@@ -534,11 +550,6 @@ body .button:hover,
 	padding: 0.5em;
 }
 
-.sidebar input[type="radio"],
-.sidebar input[type="checkbox"] {
-	width: auto !important;
-}
-
 .sidebar input[type="file"] {
 	padding: 0;
 }
@@ -875,7 +886,6 @@ img.alignright,
 
 .archive-description,
 .author-box {
-	overflow: auto;
 	background-color: #fff;
 	margin-bottom: 40px;
 	margin-bottom: 4rem;
@@ -1135,6 +1145,10 @@ img#wpstats {
 /* MapPress
 --------------------------------------------- */
 
+body .mapp-layout {
+	margin: 0;
+}
+
 .mapp-layout,
 .mapp-map-links {
 	border: none !important;
@@ -1148,7 +1162,8 @@ img#wpstats {
 	
 }
 
-.simple-section-nav .current_page_item > a {
+.simple-section-nav .current_page_item > a,
+.simple-section-nav .custom-custom-post-type-parent > a {
 	font-weight: bold;
 }
 
@@ -1267,6 +1282,7 @@ Site Header
 ---------------------------------------------------------------------------------------------------- */
 
 .site-header {
+	position: relative;
 	background-color: #fff;
 }
 
@@ -1284,11 +1300,8 @@ Site Header
 
 .title-area {
 	float: left;
+	width: auto;
 	font-weight: 700;
-	margin-bottom: 16px;
-	margin-bottom: 1.6rem;
-	width: 100%;
-	text-align: center;
 }
 
 .site-title {
@@ -1320,12 +1333,6 @@ Site Header
 	top: -9999px;
 }
 
-/* Full width header, no widgets */
-
-.header-full-width .title-area,
-.header-full-width .site-title {
-	width: 100%;
-}
 
 /* Logo
 --------------------------------------------- */
@@ -1339,12 +1346,15 @@ Site Header
 }
 
 
-/* Widget Area
+/* Header Widget Areas
 --------------------------------------------- */
 
 .site-header .widget-area {
 	width: 100%;
-	text-align: center;
+	padding: 20px;
+	background-color: #eee;
+	border: 1px solid #ddd;
+	border-width: 1px 0;
 }
 
 .site-header .search-form {
@@ -1354,6 +1364,66 @@ Site Header
 }
 
 
+/* Header Toggle Styles
+--------------------------------------------- */
+
+.site-header .toggle-buttons {
+	font-size: 0;
+	text-align: right;
+}
+
+.site-header .toggle-button {
+	margin-left: 15px;
+}
+
+.site-header .toggle-button.open {
+	color: #f15123;
+}
+
+.site-header .toggle-button:before {
+	content: "\f002";
+	font-family: FontAwesome;
+	font-size: 28px;
+	font-size: 2.8rem;
+	line-height: 1;
+}
+
+.site-header .toggle-button.nav-toggle:before {
+	content: "\f0c9";
+}
+
+
+.nav-primary,
+.site-header .nav-primary,
+.site-header .widget-area {
+	position: absolute;
+	top: 100%;
+	left: 0;
+	right: 0;
+	max-height: 0;
+	opacity: 0;
+	box-shadow: 0 4px 8px 1px rgba(0,0,0,0.4);
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
+	-webkit-transition: all .5s ease;
+	   -moz-transition: all .5s ease;
+	    -ms-transition: all .5s ease;
+	     -o-transition: all .5s ease;
+	        transition: all .5s ease;
+}
+
+.site-container > .nav-primary {
+	top: auto;
+}
+
+.nav-primary.open,
+.widget-area.open {
+	z-index: 50;
+	max-height: 9999px;
+	opacity: 1;
+	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+}
+
+
 /*
 Site Navigation
 ---------------------------------------------------------------------------------------------------- */
@@ -1361,19 +1431,21 @@ Site Navigation
 /* General Navigation
 --------------------------------------------- */
 
-#menu-button {
+#menu-toggle {
+	display: block;
+	clear: both;
 	margin: 0 20px;
 	margin: 0 2rem;
 	text-align: center;
-	display: block;
+
 }
 
-.bubble #menu-button {
+.bubble #menu-toggle {
 	margin-top: 20px;
 	margin-top: 2rem;
 }
 
-.custom-background #menu-button {
+.custom-background #menu-toggle {
 	margin-top: 0;
 }
 
@@ -1386,24 +1458,29 @@ Site Navigation
 
 .genesis-nav-menu li {
 	position: relative;
-	display: inline-block;
+	display: block;
+	border-width: 1px 0;
+}
+
+.genesis-nav-menu li.first {
+	border-top: none;
+}
+
+.genesis-nav-menu a {
+	border: 0 solid #eee;
+	border-bottom-width: 1px;
 }
 
 .genesis-nav-menu a,
 .genesis-nav-menu > .right {
-	border-width: 0;
 	color: #999;
 	display: block;
 	position: relative;
 }
 
 .genesis-nav-menu a:hover,
-.genesis-nav-menu .current_page_item > a,
-.nav-primary .genesis-nav-menu .sub-menu .current_page_item > a:hover {
-	color: #fff;
-}
-
-.genesis-nav-menu ul .current_page_item > a {
+.genesis-nav-menu [class*="current-"] > a,
+.genesis-nav-menu [class*="current_"] > a {
 	color: #fff;
 }
 
@@ -1419,7 +1496,6 @@ Site Navigation
 /* Sub Navigation
 --------------------------------------------- */
 
-.genesis-nav-menu .sub-menu,
 .genesis-nav-menu ul {
 	display: none;
 	margin: 0;
@@ -1432,141 +1508,72 @@ Site Navigation
 	transition:         opacity .4s ease-in-out;
 }
 
-.genesis-nav-menu .current_page_item > ul,
-.genesis-nav-menu .current_page_parent > ul,
-.genesis-nav-menu .current_page_ancestor > ul {
+.genesis-nav-menu [class*="current-"] > ul,
+.genesis-nav-menu [class*="current_"] > ul {
 	display: block;
 }
 
-.genesis-nav-menu li .sub-menu,
 .genesis-nav-menu li ul {
 	border: 0 solid #eee;
-	border-top-width: 1px;
 }
 
-.genesis-nav-menu > li > .sub-menu,
 .genesis-nav-menu > li > ul {
-	border: 1px solid #eee;
 	font-size: 0.9em;
 }
 
-.genesis-nav-menu .sub-menu li,
 .genesis-nav-menu ul li {
 	padding-left: 15px;
 	padding-left: 1.5rem;
 }
 
-.genesis-nav-menu .sub-menu a,
 .genesis-nav-menu ul a {
 	position: relative;
 	padding: 10px 5px;
-	border: 0 solid #eee;
-	border-bottom-width: 1px;
 }
 
-.genesis-nav-menu .sub-menu li:last-child > a,
-.genesis-nav-menu ul li:last-child > a {
-	border-bottom-width: 0;
+.genesis-nav-menu ul a:hover,
+.genesis-nav-menu ul [class*="current-"] > a,
+.genesis-nav-menu ul [class*="current_"] > a {
+	color: #222;
 }
 
-/* Site Header Navigation
---------------------------------------------- */
-
-.site-header .sub-menu {
-	border-top: 1px solid #eee;
+.genesis-nav-menu .sub-icon,
+.genesis-nav-menu ul .sub-icon {
+	position: absolute;
+	z-index: 99;
+	top: 0;
+	right: 0;
+	width: 50px;
+	padding-left: 0;
+	padding-right: 0;
+	background-color: transparent;
+	border: none;
+	text-align: center;
 }
 
-.site-header .genesis-nav-menu a {
-	padding: 15px 10px;
-	padding: 1.5rem 1rem;
-	font-size: .8em;
-}
 
-.site-header .genesis-nav-menu a:hover,
-.site-header .genesis-nav-menu .current_page_item > a,
-.site-header .genesis-nav-menu .current_page_ancestor > a {
-	color: #333;
-}
-
-.site-header .genesis-nav-menu > li {
-	display: inline-block;
-	border-top: none;
-}
-
-.site-header .genesis-nav-menu .sub-menu {
-	display: none;
-}
-
-/* Primary / Mobile Navigation
+/* Primary Navigation
 --------------------------------------------- */
 
 .nav-primary,
 .nav-secondary {
-	display: none;
-	margin: 0 20px;
-	margin: 5px 2rem 0;
-	border-radius: 3px;
 	overflow: hidden;
 	background-color: #333;
 }
 
-.genesis-nav-menu li {
-	display: block;
-}
-
-.genesis-nav-menu > li,
-.genesis-nav-menu > .right {
-	border-top: 1px solid #444;
-}
-
-.genesis-nav-menu > li.first {
-	border-top: none;
-}
-
-.genesis-nav-menu a,
-.genesis-nav-menu ul a {
+.nav-primary a {
 	padding-right: 50px;
 	padding-right: 5rem;
 }
 
-.genesis-nav-menu a:hover,
-.genesis-nav-menu .current_page_item > a,
-.genesis-nav-menu .current_page_ancestor > a {
-	color: #fff;
-}
-
-
-/* Secondary Navigation
---------------------------------------------- */
-
-.nav-secondary {
-	background-color: #fff;
-}
-
-.nav-secondary a:hover,
-.nav-secondary .current_page_item > a,
-.nav-secondary .current_page_ancestor > a,
-.nav-secondary ul .current_page_item > a {
-	color: #111;
-}
-
-.nav-secondary .current_page_item > a,
-.nav-secondary .current_page_ancestor > a {
-	font-weight: normal;
-}
-
 
 /* Navigation Extras
 --------------------------------------------- */
 
-.genesis-nav-menu > .right {
-	border-top-style: double;
-	border-width: 4px;
-}
-
 .genesis-nav-menu > .right > a {
 	display: inline;
 	padding: 0;
+	border: none;
 }
 
 .genesis-nav-menu > .right .button,
@@ -1585,7 +1592,6 @@ Site Navigation
 	float: none !important;
 	width: auto;
 	padding: 0.6em 1.2em;
-	border: none;
 }
 
 .genesis-nav-menu > .right .search-form {
@@ -1597,37 +1603,78 @@ Site Navigation
 	margin: 0 0 0 0.5em;
 }
 
-/* Sub Menus
+
+/* Secondary Navigation
 --------------------------------------------- */
 
-.genesis-nav-menu .sub-icon,
-.genesis-nav-menu ul .sub-icon {
-	position: absolute;
-	z-index: 99;
-	top: 0;
-	right: 0;
-	width: 50px;
-	padding-left: 0;
-	padding-right: 0;
-	background-color: transparent;
-	border: none;
-	text-align: center;
+.nav-secondary {
+	background-color: #fff;
 }
 
-.genesis-nav-menu ul a:hover,
-.genesis-nav-menu ul .current_page_item > a,
-.genesis-nav-menu ul .current_page_ancestor > a  {
-	color: #222;
+.nav-secondary a:hover,
+.nav-secondary [class*="current-"] > a,
+.nav-secondary [class*="current_"] > a {
+	color: #111;
 }
 
+
+/* Header Navigation
+--------------------------------------------- */
+
+.site-header .widget-area .menu a,
+.site-header .widget-area .menu .right {
+	padding: 15px 10px;
+	padding: 1.5rem 1rem;
+	font-size: .8em;
+	border-bottom-width: 0;
+}
+
+.site-header .widget-area .menu a:hover,
+.site-header .widget-area .menu [class*="current-"] > a,
+.site-header .widget-area .menu [class*="current_"] > a {
+	color: #333;
+}
+
+.site-header .widget-area .menu > li {
+	display: inline-block;
+	border-top: none;
+}
+
+.site-header .widget-area .menu li ul {
+	display: none;
+}
+
+
+/* Header Primary Navigation
+--------------------------------------------- */
+.site-header .nav-primary {
+	margin: 0;
+}
+
+.site-header .nav-primary .wrap {
+	padding: 0;
+}
+
+.site-header .nav-primary a:hover,
+.site-header .nav-primary [class*="current-"] > a,
+.site-header .nav-primary [class*="current_"] > a {
+	color: #333;
+}
+
+.site-header .right {
+	padding-right: 0;
+}
+
+
+
 /* Non jQuery Styles
 --------------------------------------------- */
 
-.no-jquery #menu-button {
-	margin-bottom: 0;
+.no-jquery #menu-toggle {
+	display: none;
 }
 
-.no-jquery #menu-button:hover + .genesis-nav-menu,
+.no-jquery #menu-toggle:hover + .genesis-nav-menu,
 .no-jquery a:hover + ul,
 .no-jquery ul:hover {
 	display: block;
@@ -2030,6 +2077,63 @@ Media Queries
 	
 }
 
+/* Responsive Tables CSS
+--------------------------------------------- */
+@media (max-width: 600px) {
+	
+	table {
+		clear: both;
+	}
+
+	tr {
+		padding: 0.5em; 
+	}
+
+	th,
+	td {
+		padding: 0;
+	}
+
+	table tbody td {
+		vertical-align: top;
+	}
+
+	table thead {
+		display: none;
+	}
+
+	table tbody {
+		line-height: 1.2;
+	}
+
+	table tbody tr {
+		margin-top: 0.5em;
+		border: 1px solid #CCC;
+	}
+
+	table tbody tr,
+	table tbody td {
+		display: block;
+		width: 100%;
+		height: auto;
+	}
+
+	table tbody td {
+		display: block;
+		border: none;
+	}
+
+	table ul {
+		margin: 5px 0px 10px 20px;
+		margin: 0.5rem 0 1rem 2rem;
+	}
+
+	table li {
+		margin-bottom: .5em;
+	}
+
+}
+
 @media (min-width: 768px) {
 
 	/* General
@@ -2047,18 +2151,17 @@ Media Queries
 		background-position: left top;
 	}
 
-	.title-area {
-		width: auto;
-		margin-bottom: 0;
-		text-align: left;
-	}
-
 	.logo-mobile {
 		display: none;
 	}
 
 	.logo-full {
-		display: inline-block;
+		display: block;
+	}
+
+	.site-header .widget-area {
+		padding: 0;
+		border: none;
 	}
 
 	.header-image .site-header .widget-area {
@@ -2071,6 +2174,7 @@ Media Queries
 		clear: right;
 	}
 
+	.site-header .menu > .last,
 	.site-header .menu > .last a {
 		padding-right: 0;
 	}
@@ -2083,14 +2187,39 @@ Media Queries
 		width: auto;
 	}
 
-	.site-header .genesis-nav-menu {
+	.site-header .widget-area .menu {
 		text-align: right;
 	}
 
-	.site-header .genesis-nav-menu .sub-menu {
+	.site-header .widget-area .menu ul {
 		display: block;
 	}
 
+	/* Header Toggle Styles
+	--------------------------------------------- */
+	.nav-primary,
+	.site-header .nav-primary,
+	.site-header .widget-area {
+		position: static;
+		top: auto;
+		right: auto;
+		left: auto;
+		max-height: 9999px;
+		opacity: 1;
+		-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
+		box-shadow: none;
+	}
+
+	.site-header .nav-primary,
+	.site-header .widget-area {
+		background-color: transparent;
+	}
+
+	.site-header .toggle-button {
+		display: none;
+	}
+
+
 	/* Content
 	--------------------------------------------- */
 
@@ -2216,7 +2345,6 @@ Media Queries
 	.one-third,
 	.two-sixths,
 	.sidebar-primary,
-	.title-area,
 	.footer-widgets-number-3 .footer-widgets .widget-area  {
 		width: 31.623931623931625%;
 	}
@@ -2269,7 +2397,8 @@ Media Queries
 
 	/* Non-Mobile Navigation
 	--------------------------------------------- */
-	#menu-button {
+	#menu-toggle,
+	.widget-area-toggle {
 		display: none;
 	}
 
@@ -2287,10 +2416,10 @@ Media Queries
 	}
 
 	.genesis-nav-menu > li {
+		float: left;
 		border-top-width: 0;
 	}
 
-	.genesis-nav-menu .sub-menu,
 	.genesis-nav-menu ul {
 		display: block;
 		left: -9999px;
@@ -2309,8 +2438,18 @@ Media Queries
 	.genesis-nav-menu > .right {
 		padding: 16px 20px;
 		padding: 1.6rem 2rem;
+		border-bottom-width: 0;
 	}
 
+
+	/* Primary Navigation
+	--------------------------------------------- */
+	.nav-primary a {
+		padding-right: 20px;
+		padding-right: 2rem;
+	}
+
+
 	/* Navigation Extras
 	--------------------------------------------- */
 
@@ -2336,20 +2475,17 @@ Media Queries
 	/* Sub Menus
 	--------------------------------------------- */
 
-	.genesis-nav-menu li .sub-menu,
 	.genesis-nav-menu li ul {
 		border-width: 0 0 1px;
 	}
 
-	.genesis-nav-menu .sub-menu li,
 	.genesis-nav-menu ul li {
+		width: 100%;
 		padding-left: 0;
 	}
 
-	.genesis-nav-menu .sub-menu a, 
 	.genesis-nav-menu ul a {
 		position: relative;
-		width: 200px;
 		padding: 10px 20px;
 		padding: 1rem 2rem;
 		border-width: 1px 1px 0 1px;
@@ -2381,6 +2517,7 @@ Media Queries
 	.genesis-nav-menu li:hover > ul {
 		left: auto;
 		opacity: 1;
+		display: block !important;
 	}
 
 	.genesis-nav-menu ul li:hover > ul {
@@ -2389,6 +2526,24 @@ Media Queries
 		margin-left: -1px;
 	}
 
+	/* Header Primary Navigation
+	--------------------------------------------- */
+	.site-header .nav-primary {
+		background-color: transparent;
+		text-align: right;
+	}
+
+	.site-header .nav-primary .wrap,
+	.site-header .nav-primary .wrap .menu { /* Required for IE8 */
+		float: right;
+		width: auto;
+	}
+
+	.site-header .nav-primary .menu > li > a {
+		padding: 0.6em 1.2em;
+	}
+
+
 	/* Plugins
 	--------------------------------------------- */
 	
@@ -2425,4 +2580,4 @@ Media Queries
 		margin: 20px auto;
 	}
 
-}
+}