Skip to content

Commit

Permalink
Merge pull request #109 from FameThemes/development
Browse files Browse the repository at this point in the history
Update WordPress.org requirements.
  • Loading branch information
shrimp2t committed Jun 1, 2016
2 parents bf5d870 + 2c11ef0 commit 6a8cabe
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion assets/sass/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Version: 1.2.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: onepress
Tags: one-column, two-columns, left-sidebar, right-sidebar, fluid-layout, responsive-layout, custom-menu, featured-images, full-width-template, sticky-post, theme-options, threaded-comments, translation-ready, blue, light
Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-menu, featured-images, full-width-template, sticky-post, theme-options, threaded-comments, translation-ready, e-commerce, blog, portfolio
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
Expand Down
3 changes: 2 additions & 1 deletion changelog.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
====================================================================
CHANGELOG
=========
====================================================================
## 1.2.3
* Fix Background image full screen when header transparent.
* Fix issue No Custom CSS under Theme Options when defined DISALLOW_FILE_EDIT = false.
* Fix issue counter section.
* Close the mobile menu when click on any menu links.
* Update new WordPress.org theme-check requirements

## 1.2.2
* Update selective refresh render callback.
Expand Down
16 changes: 8 additions & 8 deletions inc/customizer-selective-refresh.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,24 @@
function onepress_customizer_load_template( $template_names ){
$located = '';

$is_child = STYLESHEETPATH != TEMPLATEPATH ;
$is_child = get_stylesheet_directory() != get_template_directory() ;
foreach ( (array) $template_names as $template_name ) {
if ( !$template_name )
continue;

if ( $is_child && file_exists( STYLESHEETPATH . '/' . $template_name ) ) { // Child them
$located = STYLESHEETPATH . '/' . $template_name;
if ( $is_child && file_exists( get_stylesheet_directory() . '/' . $template_name ) ) { // Child them
$located = get_stylesheet_directory() . '/' . $template_name;
break;

} elseif ( defined( 'ONEPRESS_PLUS_PATH' ) && file_exists( ONEPRESS_PLUS_PATH . $template_name ) ) { // Check part in the plugin
$located = ONEPRESS_PLUS_PATH . $template_name;
break;
} elseif ( file_exists(TEMPLATEPATH . '/' . $template_name) ) { // current_theme
$located = TEMPLATEPATH . '/' . $template_name;
} elseif ( file_exists( get_template_directory() . '/' . $template_name) ) { // current_theme
$located = get_template_directory() . '/' . $template_name;
break;
}
}

return $located;
}

Expand Down Expand Up @@ -219,7 +219,7 @@ function onepress_customizer_partials( $wp_customize ) {
'settings' => array( 'onepress_newsletter_title' ),
'render_callback' => 'onepress_selective_refresh_newsletter_title',
) );

}
add_action( 'customize_register', 'onepress_customizer_partials', 50 );

Expand All @@ -246,4 +246,4 @@ function onepress_selective_refresh_social_footer_title(){

function onepress_selective_refresh_newsletter_title(){
return get_theme_mod( 'onepress_newsletter_title' );
}
}
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Version: 1.2.3
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Text Domain: onepress
Tags: one-column, two-columns, left-sidebar, right-sidebar, fluid-layout, responsive-layout, custom-menu, featured-images, full-width-template, sticky-post, theme-options, threaded-comments, translation-ready, blue, light
Tags: one-column, two-columns, left-sidebar, right-sidebar, custom-menu, featured-images, full-width-template, sticky-post, theme-options, threaded-comments, translation-ready, e-commerce, blog, portfolio
This theme, like WordPress, is licensed under the GPL.
Use it to make something cool, have fun, and share what you've learned with others.
Expand Down

0 comments on commit 6a8cabe

Please sign in to comment.