Skip to content

Commit

Permalink
Merge pull request #272 from MachoThemes/master
Browse files Browse the repository at this point in the history
2.1.1
  • Loading branch information
giucu91 committed May 9, 2018
2 parents 0a7189a + f053459 commit b693e42
Show file tree
Hide file tree
Showing 8 changed files with 5 additions and 2 deletions.
Binary file removed .DS_Store
Binary file not shown.
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
### V 2.1.1
- fixed a wrong URL for loading fancybox JS

### V 2.1.0
- updated grunt package.json
- Fixed #256 (videos in project section, they need an image backup)
Expand Down
2 changes: 1 addition & 1 deletion functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ function illdy_enqueue_javascripts() {
wp_enqueue_script( 'illdy-count-to', get_template_directory_uri() . '/layout/js/count-to/count-to.min.js', array( 'jquery' ), '', true );
wp_enqueue_script( 'illdy-visible', get_template_directory_uri() . '/layout/js/visible/visible.min.js', array( 'jquery' ), '', true );
if ( get_theme_mod( 'illdy_projects_lightbox', 0 ) == 1 ) {
wp_enqueue_script( 'illdy-fancybox', get_template_directory_uri() . '/layout/js/fancybox/jquery.fancybox.min.js', array( 'jquery' ), '3.3.5', true );
wp_enqueue_script( 'illdy-fancybox', get_template_directory_uri() . '/layout/js/fancybox/jquery-fancybox.min.js', array( 'jquery' ), '3.3.5', true );
wp_add_inline_script( 'illdy-fancybox', 'jQuery(".fancybox").fancybox();' );
}
if ( get_theme_mod( 'illdy_sticky_header_enable', false ) ) {
Expand Down
Binary file removed layout/.DS_Store
Binary file not shown.
Binary file removed layout/css/.DS_Store
Binary file not shown.
Binary file removed layout/js/.DS_Store
Binary file not shown.
Binary file removed layout/js/fancybox/.DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI: http://colorlib.com/wp/themes/illdy/
Author: Colorlib
Author URI: http://colorlib.com
Description: Illdy is a stunning multipurpose WordPress theme built based on Bootstrap frontend framework making it fully responsive and mobile friendly. This theme is well suited for business, landing page, portfolio or any other creative websites. This leaves heavy lifting to WordPress Customizer therefore you can create your website on live preview mode. Which means that you can see changes happen on your website in real time as you make them
Version: 2.1.0
Version: 2.1.1
License: GNU General Public License v2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
Tags: blog, e-commerce, portfolio
Expand Down

0 comments on commit b693e42

Please sign in to comment.