10h30/trestle
1
0
Fork 0
mirror of https://github.com/10h30/trestle.git synced 2026-07-11 18:56:07 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts from feature/trestle-settings.

Browse Source
This commit is contained in:
MickeyKay
2015-05-11 17:11:29 -07:00
parent c7055b91ac 1bb6537455
commit 7e666d0bb9
7 changed files with 426 additions and 586 deletions
Download Patch File Download Diff File Expand all files Collapse all files
functions.php
+18 -24
View File
@@ -1,7 +1,7 @@
<?php
/**
* Theme functionality
* Theme functionality.
*
* @since 1.0.0
*
@@ -12,30 +12,30 @@
* Required Files
===========================================*/
// Theme functions
// Theme functions.
require_once dirname( __FILE__ ) . '/includes/functions/theme-functions.php';
// Admin functionality
// Admin functionality.
require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
// Customizer controls
// Customizer controls.
require_once dirname( __FILE__ ) . '/includes/admin/customizer.php';
// Shortcodes
// Shortcodes.
require_once dirname( __FILE__ ) . '/includes/shortcodes/shortcodes.php';
// Additional sidebars
// Additional sidebars.
require_once dirname( __FILE__ ) . '/includes/widget-areas/widget-areas.php';
// Plugin activation class
// Plugin activation class.
require_once dirname( __FILE__ ) . '/includes/classes/class-tgm-plugin-activation.php';
// Better Font Awesome Library
// Better Font Awesome Library.
require_once dirname( __FILE__ ) . '/lib/better-font-awesome-library/better-font-awesome-library.php';
add_action( 'genesis_setup', 'trestle_theme_setup', 15 );
/**
* Initialize Trestle
* Initialize Trestle.
*
* @since 1.0.0
*/
@@ -45,22 +45,16 @@ function 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.2.0' );
// Child theme definitions (do not remove).
define( 'TRESTLE_THEME_NAME', 'Trestle' );
define( 'TRESTLE_THEME_URL', 'http://demo.mightyminnow.com/theme/trestle/' );
define( 'TRESTLE_THEME_VERSION', '1.2.0' );
define( 'TRESTLE_SETTINGS_FIELD', 'trestle-settings' );
// Load theme text domain
// Setup default theme settings.
trestle_settings_defaults();
// Load theme text domain.
load_theme_textdomain( 'trestle', get_stylesheet_directory() . '/languages' );
// Add HTML5 markup structure
add_theme_support( 'html5' );
// Add viewport meta tag for mobile browsers
add_theme_support( 'genesis-responsive-viewport' );
// 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 );
}