Merge branch 'release/1.2.2'

Author: Misplon

README.md

@@ -52,6 +52,11 @@ Font created using Icomoon - http://icomoon.io
 Change Log
 ---------------
 
+####1.2.2 - 29 June 2017
+* Fixed slider menu overlap bug.
+* Updated Settings Framework.
+* Updated SiteOrigin Panels Lite.
+
 ####1.2.1 - 30 May 2016
 * Fixed compatibility with Influence Plus.
 

build

@@ -61,6 +61,11 @@ module.exports = {
 			'!{tmp,tmp/**}'                     // Ignore tmp/ and contents
 		]
 	},
+    css: {
+        src: [
+            'style.css'
+        ],
+    },	
 	copy: {
 		src: [
 			'**/!(*.js|*.scss|style.css)',                                  // Everything except .js and .scss files

build-config.js

@@ -7,8 +7,9 @@
  * @license GPL 2.0
  */
 
-define('SITEORIGIN_THEME_VERSION', 'dev');
-define('SITEORIGIN_THEME_JS_PREFIX', '');
+define( 'SITEORIGIN_THEME_VERSION', 'dev' );
+define( 'SITEORIGIN_THEME_JS_PREFIX', '' );
+define( 'SITEORIGIN_THEME_CSS_PREFIX', '' );
 
 // Include all the SiteOrigin extras
 include get_template_directory() . '/inc/webfonts/webfonts.php';

functions.php

@@ -7,7 +7,7 @@ Description: Influence is a free WordPress theme that gives you a canvas to shar
 Version: dev
 License: GNU General Public License
 License URI: http://www.gnu.org/copyleft/gpl.html
-Tags: responsive-layout, fluid-layout, custom-background, custom-menu, featured-images, theme-options, threaded-comments, translation-ready
+Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
 Text Domain: origami
 */
 /* =Reset

inc/panels-lite

@@ -4,10 +4,10 @@ Author: SiteOrigin
 Author URI: http://siteorigin.com/
 Theme URI: http://siteorigin.com/theme/influence/
 Description: Influence is a free WordPress theme that gives you a canvas to share your videos, photography and content. It features a modern, responsive design and tight integration with our own Page Builder plugin to make sure your content is responsive too. The best feature of Influence is its huge home page slider - perfect if you're using Influence to build a business or portfolio website. This slider has support for video background images and, like the rest of Influence, is fully responsive. We offer free support on our support <a href="http://siteorigin.com/thread/">forums</a> (http://siteorigin.com/thread/).
-Version: trunk
+Version: dev
 License: GNU General Public License
 License URI: http://www.gnu.org/copyleft/gpl.html
-Tags: responsive-layout, fluid-layout, custom-background, custom-menu, featured-images, theme-options, threaded-comments, translation-ready
+Tags: one-column, two-columns, custom-background, custom-colors, custom-logo, featured-images, footer-widgets, sticky-post, theme-options, threaded-comments, translation-ready, blog, photography, portfolio
 Text Domain: origami
 */