Merge pull request #158 from presscodes/infinite-scroll

Minor updates & bugfixes

CHANGELOG.md

@@ -1,5 +1,6 @@
-## HEAD
+## 1.2
 
+* New: Kirki & Timber plugins as well as some Jetpack classes are now embedded. Installing external plugins is no longer required for the core theme.
 * New: Easy-Digital-Downloads integration
 * New: WooCommerce integration
 * Fix: Core shell CSS tweaks

functions.php

@@ -27,7 +27,7 @@ function maera_autoload_classes( $class_name ) {
 /**
  * If Kirki is not installed as a plugin include the embedded Version
  */
-if ( ! class_exists( 'Kirki' ) ) {
+if ( ! class_exists( 'Kirki' ) && ! is_admin() ) {
 	define( 'KIRKI_PATH', get_template_directory() . '/includes/plugins/kirki' );
 	define( 'KIRKI_URL', get_template_directory_uri() . '/includes/plugins/kirki' );
 	require_once( get_template_directory() . '/includes/plugins/kirki/kirki.php' );
@@ -36,15 +36,15 @@ function maera_autoload_classes( $class_name ) {
 /**
  * If Timber is not installed as a plugin include the embedded version.
  */
-if ( ! class_exists( 'Timber' ) ) {
+if ( ! class_exists( 'Timber' ) && ! is_admin() ) {
 	require_once( get_template_directory() . '/includes/plugins/timber-library/timber.php' );
 }
 
 /**
  * Dummy function to prevent fatal errors with the Tonesque library
  * Only used when Jetpack is not installed.
  */
-if ( ! function_exists( 'jetpack_require_lib' ) ) {
+if ( ! function_exists( 'jetpack_require_lib' ) && ! is_admin() ) {
 	function jetpack_require_lib() {}
 }
 

includes/class-maera.php

@@ -16,7 +16,7 @@ class Maera {
 
 	function __construct() {
 
-		Maera_Helper::define( 'MAERA_VERSION', '1.1.1' );
+		Maera_Helper::define( 'MAERA_VERSION', '1.2' );
 		Maera_Helper::define( 'MAERA_ASSETS_URL', get_stylesheet_directory_uri() . '/assets' );
 
 		add_filter( 'kirki/config', array( $this, 'customizer_config' ) );

style.css

@@ -2,7 +2,7 @@
 Theme Name:         Maera
 Theme URI:          http://maera.io
 Description:        Advanced WordPress theme based on Bootstrap.
-Version:            1.1.1
+Version:            1.2
 Author:             aristath, fovoc
 Author URI:         http://wpmu.io
 License:            GPL v2 License

views/main.twig

@@ -1,6 +1,6 @@
 {% extends "base.twig" %}
 {% block main %}
-<main class="{{ 'main'|apply_filters( 'maera/section_class/content' ) }}" role="main">
+<main class="{{ 'main'|apply_filters( 'maera/section_class/content' ) }}" role="main" id="main">
 	{% if title %}<h1>{{ title }}</h1>{% endif %}
 	{% block content %}
 		{{ __( 'Sorry, no content', 'maera' ) }}