Skip to content

Commit

Permalink
Merge
Browse files Browse the repository at this point in the history
  • Loading branch information
KingYes committed Aug 20, 2017
2 parents ad66440 + 0f3518a commit f720d4a
Show file tree
Hide file tree
Showing 12 changed files with 36 additions and 15 deletions.
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
**Tags:** page builder, editor, landing page, drag-and-drop, elementor, visual editor, wysiwyg, design, maintenance mode, coming soon, under construction, website builder, landing page builder, front-end builder
**Requires at least:** 4.5
**Tested up to:** 4.8
**Stable tag:** 1.6.4
**Stable tag:** 1.6.5
**License:** GPLv3
**License URI:** https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -185,6 +185,11 @@ No. Elementor supports WordPress 4.5 or greater, and is compatible with PHP 5.4

## Changelog ##

### 1.6.5 - 20.08.2017 ###
* Tweak! - Added compatibility for the future release of Elementor Pro
* Fix! - Set font size inherit for Heading widget ([#2098](https://github.com/pojome/elementor/issues/2098))
* Fix! - Anchor links smooth scrolling not working when admin bar is disabled ([#2210](https://github.com/pojome/elementor/issues/2210))

### 1.6.4 - 06.08.2017 ###
* Tweak! - Allow to close lightbox when clicking outside of the element
* Fix! - Added font family inherit for input placeholder
Expand Down
3 changes: 2 additions & 1 deletion assets/css/frontend-rtl.css

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

2 changes: 1 addition & 1 deletion assets/css/frontend-rtl.min.css

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion assets/css/frontend.css

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

2 changes: 1 addition & 1 deletion assets/css/frontend.min.css

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions assets/dev/js/frontend/utils/anchors.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,12 @@ module.exports = ViewModule.extend( {
return;
}

var adminBarHeight = this.elements.$wpAdminBar.height(),
scrollTop = $anchor.offset().top - adminBarHeight;
var hasAdminBar = ( 1 <= this.elements.$wpAdminBar.length ),
scrollTop = $anchor.offset().top;

if ( hasAdminBar ) {
scrollTop -= this.elements.$wpAdminBar.height();
}

event.preventDefault();

Expand Down
1 change: 1 addition & 0 deletions assets/dev/scss/frontend/widgets/heading.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

> a {
color: inherit;
font-size: inherit;
}

&.elementor-size- {
Expand Down
8 changes: 6 additions & 2 deletions assets/js/frontend.js

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

2 changes: 1 addition & 1 deletion assets/js/frontend.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions elementor.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Description: The most advanced frontend drag & drop page builder. Create high-end, pixel perfect websites at record speeds. Any theme, any page, any design.
* Plugin URI: https://elementor.com/
* Author: Elementor.com
* Version: 1.6.4
* Version: 1.6.5
* Author URI: https://elementor.com/
*
* Text Domain: elementor
Expand All @@ -27,7 +27,7 @@
exit; // Exit if accessed directly.
}

define( 'ELEMENTOR_VERSION', '1.6.4' );
define( 'ELEMENTOR_VERSION', '1.6.5' );
define( 'ELEMENTOR_PREVIOUS_STABLE_VERSION', '1.5.5' );

define( 'ELEMENTOR__FILE__', __FILE__ );
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "elementor",
"slug": "elementor",
"version": "1.6.4",
"version": "1.6.5",
"prev_stable_version": "1.5.5",
"author": "Pojo Team",
"homepage": "http://pojo.me/",
Expand Down Expand Up @@ -56,4 +56,4 @@
]
}
}
}
}
7 changes: 6 additions & 1 deletion readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Contributors: pojo.me, KingYes, ariel.k, jzaltzberg, mati1000, pojosh, yehudah
Tags: page builder, editor, landing page, drag-and-drop, elementor, visual editor, wysiwyg, design, maintenance mode, coming soon, under construction, website builder, landing page builder, front-end builder
Requires at least: 4.5
Tested up to: 4.8
Stable tag: 1.6.4
Stable tag: 1.6.5
License: GPLv3
License URI: https://www.gnu.org/licenses/gpl-3.0.html

Expand Down Expand Up @@ -183,6 +183,11 @@ No. Elementor supports WordPress 4.5 or greater, and is compatible with PHP 5.4

== Changelog ==

= 1.6.5 - 20.08.2017 =
* Tweak! - Added compatibility for the future release of Elementor Pro
* Fix! - Set font size inherit for Heading widget ([#2098](https://github.com/pojome/elementor/issues/2098))
* Fix! - Anchor links smooth scrolling not working when admin bar is disabled ([#2210](https://github.com/pojome/elementor/issues/2210))

= 1.6.4 - 06.08.2017 =
* Tweak! - Allow to close lightbox when clicking outside of the element
* Fix! - Added font family inherit for input placeholder
Expand Down

0 comments on commit f720d4a

Please sign in to comment.