Skip to content

Commit

Permalink
Merge pull request #232 from MachoThemes/master
Browse files Browse the repository at this point in the history
Update to 2.0.3
  • Loading branch information
cristianraiber authored Oct 2, 2017
2 parents 59b9b24 + da7ee0d commit 3639c5c
Show file tree
Hide file tree
Showing 12 changed files with 41 additions and 31 deletions.
14 changes: 12 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,5 +61,15 @@ cache:
directories:
- node_modules
after_success:
- if [[ "$DEPLOY" == "1" ]]; then grunt build-archive; fi
- if [[ "$DEPLOY" == "1" ]]; then sh set_tags.sh; fi
- if [[ "$DEPLOY" == "1" ]]; then grunt build-archive; fi
- if [[ "$DEPLOY" == "1" ]]; then sh set_tags.sh; fi
deploy:
provider: releases
skip_cleanup: true
api_key:
secure: FSgyXXwuQGFOfh3JgR1bPmzDabRAxQKObyR7bK9nP3eUIPGoGMc6mufLwqhaOjUYKh3qR9gXL7sGw5Hh0sjc9Tu7pg8g4RAKftvWn0ER8MDCjs58Yh/dpVmsZ/JQHUufTlBsqeOv+5h8dzELDaMjBiinZ/qBF02wIDvf/MpxtbFfUxPOkIGzHTt5Uc5AtVtZHoNBM0vHeDWWb3RKdIryU9eHUYNyG+rAjTots1KNsc0//57J+uHbWRA/15gm/omuB9aHeLweTtTH+vEj7RIli8Sx0EaxPXWB+pnMK2qtNec6SgET9DgXC3FJZOybfazFQaR21OZxvS5OnYBEnZdztsHWDI7EELrD6NVtkfPZ97cXBAsv1jZDeVn42k4feCfo9sBazEjati1BiWJbWCnJ8LCyVUntyl3Iy7do6KjihwnxVOJU+wvBTQR1e+wyLjLoBFKnWMNW7U4AauXwFJe0oa25/cUT2Ydzn9XYrbCsmgrG8XYocXvrxQxpAT1r8xOrTnqN04CYdZffVrw4L0NwQLvLdK6EtMywCo+UC8rBtDlPE1rD2K8qX4+P59AeRZt/4+KvtIxedlau5PrXPqTAIQo8Sdv4UxVkO535K8r9ICWoMk2WpOs8NRyBBNQBdN3ZcWi3SWlcqrFrqA4JxltUO1fMMfqcsrPzb/Y0DedgJYk=
file: illdy.zip
on:
repo: puikinsh/illdy
branch: 'master'
condition: "$DEPLOY = 1"
19 changes: 11 additions & 8 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
### V 2.2.0
- When opening a front-page panel now, it automatically scrolls you to it.
- The theme now handles the 404 Page Content. It works really nice, by loading the 404 page in the Customizer so you can live-edit it. When hitting back, it returns you to the panel you were in, before.
- Tabs used in all of the front-page sections now use AJAX to load. This means that they load instantly with a nice expand effect
- For the Jumbotron area, the theme now supports: slides (with repeater from Epsilon Framework) as well as videos (core support). Changes show up in real-time.
- The theme's preloader doesn't show up anymore when users are changing values from the Customizer.
- Color scheme picker has been implemented.
- Theme widgets now support basic HTML (by using TinyMCE instances)
### V 2.0.3
- Fixed Submenu issue ( https://github.com/puikinsh/illdy/issues/226 )

### V 2.0.2
- When opening a front-page panel now, it automatically scrolls you to it.
- The theme now handles the 404 Page Content. It works really nice, by loading the 404 page in the Customizer so you can live-edit it. When hitting back, it returns you to the panel you were in, before.
- Tabs used in all of the front-page sections now use AJAX to load. This means that they load instantly with a nice expand effect
- For the Jumbotron area, the theme now supports: slides (with repeater from Epsilon Framework) as well as videos (core support). Changes show up in real-time.
- The theme's preloader doesn't show up anymore when users are changing values from the Customizer.
- Color scheme picker has been implemented.
- Theme widgets now support basic HTML (by using TinyMCE instances)

### V2.0.1
- Fixed left sidebar mobile issue. ( https://github.com/puikinsh/illdy/issues/176 )
Expand Down
7 changes: 5 additions & 2 deletions layout/css/custom.css
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
#header .top-header .header-navigation ul li.menu-item-has-children .sub-menu .sub-menu {
width: 250px;
padding-top: 0;
top: 0;
left: 250px;
left: 200px;
}

#header .top-header .header-navigation ul li.menu-item-has-children .sub-menu {
display: block;
visibility: hidden;
z-index: 99;
}
#header .top-header .header-navigation ul li.menu-item-has-children:hover > .sub-menu {
visibility: visible;
}

.woocommerce {}
Expand Down
2 changes: 1 addition & 1 deletion layout/css/custom.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 6 additions & 2 deletions layout/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ a:hover, a:focus {

#header .top-header .header-navigation ul li.menu-item-has-children .sub-menu {
width: 200px;
margin: 0;
margin: -5px 0 0;
padding: 0;
position: absolute;
left: 50%;
Expand Down Expand Up @@ -2905,7 +2905,11 @@ header#header {
height: 100%;
z-index: 1;
}
#header .top-header,
#header .top-header {
position: relative;
z-index: 3;
}

.responsive-menu,
#header .bottom-header {
position: relative;
Expand Down
2 changes: 1 addition & 1 deletion layout/css/main.min.css

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions layout/js/scripts.js
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,6 @@ jQuery( document ).ready( function($) {
}
}

// Sub Menu
function subMenu() {
$( '#header .top-header .header-navigation ul li.menu-item-has-children' ).hover( function() {
$( this ).children( 'ul' ).css( 'visibility', 'visible' );
}, function() {
$( this ).children( 'ul' ).css( 'visibility', 'hidden' );
});
}

// Align Sub Sub Menu
function alignSubSubMenu() {
if( $( '#header .top-header .header-navigation ul li.menu-item-has-children' ).length ) {
Expand All @@ -109,7 +100,6 @@ jQuery( document ).ready( function($) {
addHeightToFrontPageProject();
setColorOnFrontPageService();
setColorOnFrontPagePerson();
subMenu();
alignSubSubMenu();
});

Expand Down
2 changes: 1 addition & 1 deletion layout/js/scripts.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion layout/js/scripts.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "illdy",
"main": "Gruntfile.js",
"author": "Colorlib",
"version": "2.0.2",
"version": "2.0.3",
"repository": "https://github.com/puikinsh/illdy",
"license": "GPL v3",
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion set_tags.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
BRANCH="production"
BRANCH="master"

# Are we on the right branch?
if [ "$TRAVIS_BRANCH" = "$BRANCH" ]; then
Expand Down
Loading

0 comments on commit 3639c5c

Please sign in to comment.