Skip to content

Commit

Permalink
Merge pull request elementor#8259 from kobizz/release/2.6.0
Browse files Browse the repository at this point in the history
Release/2.6.0
  • Loading branch information
KingYes authored Jun 5, 2019
2 parents e2c1cca + 3e8214f commit 0a0d111
Show file tree
Hide file tree
Showing 12 changed files with 47 additions and 25 deletions.
2 changes: 1 addition & 1 deletion assets/dev/scss/admin/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
.wp-menu-image {

&:before {
content: '\e1037';
content: '\e8ff';
font-family: eicons;
font-size: 18px;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/dev/scss/admin/_new-template-dialog.scss
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@

&:after {
font-family: eicons;
content: '\e955';
content: '\e8ad';
position: absolute;
top: 50%;
@include end(10px);
Expand Down
4 changes: 2 additions & 2 deletions assets/dev/scss/editor/_global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@
&:hover {

&:before {
content: '\e965';
content: '\e8b7';
}
}

&:active {

&:before {
content: '\e964';
content: '\e8b6';
}
}
}
10 changes: 4 additions & 6 deletions assets/dev/scss/editor/_templates-modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ $remote-templates-items-space: 30px;
font-size: 18px;

&:before {
content: getValueByDirection( '\e908', '\e907' );
content: getValueByDirection( '\e87e', '\e87d' );
}
}
}
Expand Down Expand Up @@ -137,7 +137,7 @@ $remote-templates-items-space: 30px;

&:after {
font-family: eicons;
content: '\e956';
content: '\e8ae';
@include margin-start(3px);
}
}
Expand All @@ -147,7 +147,7 @@ $remote-templates-items-space: 30px;
+ .elementor-template-library-order-label {

&:after {
content: '\e955';
content: '\e8ad';
}
}
}
Expand Down Expand Up @@ -278,13 +278,11 @@ label.elementor-template-library-order-label {
width: 200px;
position: relative;

&:after {
content: '\e863';
i {
position: absolute;
top: 50%;
@include end(0);
transform: translateY(-50%);
font-family: eicons;
}
}

Expand Down
2 changes: 1 addition & 1 deletion assets/dev/scss/editor/editor-preview.scss
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ html.elementor-html {
.eicon-edit {

&:before {
content: '\e1040';
content: '\e902';
}
}
}
Expand Down
31 changes: 22 additions & 9 deletions assets/dev/scss/editor/navigator/navigator.scss
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,14 @@
.elementor-navigator {

&__item {
position: relative;
display: flex;
height: 32px;
font-size: 12px;
height: 30px;
font-size: 11px;
border-bottom: 1px solid $editor-background;
cursor: pointer;
transition: padding .5s linear;
overflow: hidden;

&:not(.elementor-active) {

Expand Down Expand Up @@ -173,7 +176,7 @@

&:not(:hover) {

.elementor-navigator__element__toggle, .elementor-navigator__element__indicators {
.elementor-navigator__element__toggle {
display: none;
}
}
Expand Down Expand Up @@ -225,9 +228,23 @@
}

&__toggle {
text-align: $end;
position: absolute;
@include end(15px);
height: 100%;
z-index: 0;
font-size: 13px;
padding: 0 10px;
}

&__indicators {
position: relative;
transition: transform .5s;
background-color: #fff;
@include padding-start(5px);
z-index: 91;

&:not(:hover) {
transform: translateX(calc(100% - 8px));
}
}

&__indicator {
Expand All @@ -248,10 +265,6 @@
}
}

&__indicators {
background-color: #fff;
}

&--hidden {

.elementor-navigator__element__title,
Expand Down
2 changes: 1 addition & 1 deletion assets/dev/scss/editor/panel/_categories.scss
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
cursor: pointer;

&:before {
content: getValueByDirection( '\e907', '\e908' );
content: getValueByDirection( '\e87d', '\e87e' );
font-family: eicons;
position: absolute;
@include end(0);
Expand Down
2 changes: 1 addition & 1 deletion assets/dev/scss/editor/panel/_control.scss
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@

&:after {
font-family: eicons;
content: '\e955';
content: '\e8ad';
font-size: 12px;
position: absolute;
top: 50%;
Expand Down
12 changes: 11 additions & 1 deletion core/common/modules/ajax/module.php
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,17 @@ private function send_success() {
],
];

echo wp_json_encode( $response );
$json = wp_json_encode( $response );

if ( function_exists( 'gzencode' ) ) {
header( 'Content-Type: application/json; charset=utf-8' );

header( 'Content-Encoding: gzip' );

echo gzencode( $json );
} else {
echo $json;
}

wp_die( '', '', [ 'response' => null ] );
}
Expand Down
2 changes: 1 addition & 1 deletion core/common/modules/finder/categories/create.php
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public function get_category_items( array $options = [] ) {
$items[ $post_type ] = [
/* translators: %s the title of the post type */
'title' => sprintf( __( 'Add New %s', 'elementor' ), $post_type_object->labels->singular_name ),
'icon' => 'plus-circle',
'icon' => 'plus-circle-o',
'url' => $url,
'keywords' => [ 'post', 'page', 'template', 'new', 'create' ],
];
Expand Down
1 change: 1 addition & 0 deletions includes/editor-templates/templates.php
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
<div id="elementor-template-library-filter-text-wrapper">
<label for="elementor-template-library-filter-text" class="elementor-screen-only"><?php echo __( 'Search Templates:', 'elementor' ); ?></label>
<input id="elementor-template-library-filter-text" placeholder="<?php echo esc_attr__( 'Search', 'elementor' ); ?>">
<i class="eicon-search"></i>
</div>
</div>
<# if ( 'local' === activeSource ) { #>
Expand Down
2 changes: 1 addition & 1 deletion includes/widgets/text-editor.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public function get_title() {
* @return string Widget icon.
*/
public function get_icon() {
return 'eicon-align-left';
return 'eicon-text';
}

/**
Expand Down

0 comments on commit 0a0d111

Please sign in to comment.