Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
ciorici committed Dec 6, 2024
2 parents e97bc8b + cc06615 commit 9b2ce77
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 12 deletions.
2 changes: 1 addition & 1 deletion includes/editor-templates/templates.php
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<option value ='cookbook'>CookBook</option>
<option value ='foodica'>Foodica (PRO)</option>
<option value ='inspiro-pro'>Inspiro PRO</option>
<option value ='inspiro-classic'>Inspiro Premium</option>
<option value ='inspiro-premium'>Inspiro Premium</option>
<option value ='inspiro-lite'>Inspiro Lite</option>
</select>
</div>
Expand Down
2 changes: 1 addition & 1 deletion includes/widgets/pricing-table/frontend.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.wpz-pricing-table > .elementor-widget-container {
.elementor-widget-wpzoom-elementor-addons-pricing-table {
position: relative;
overflow: hidden;
padding: 3em 4em;
Expand Down
68 changes: 60 additions & 8 deletions includes/widgets/slider-pro/slider-pro.php
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,63 @@ protected function register_style_controls() {

$current_theme = get_template();

/* Option for Inspiro Premium*/
if( 'inspiro' === $current_theme ) {

$this->add_control(
'slideshow_align',
[
'label' => esc_html__( 'Content Alignment', 'wpzoom-elementor-addons' ),
'type' => Controls_Manager::CHOOSE,
'label_block' => false,
'options' => [
'left' => [
'title' => esc_html__( 'Left', 'wpzoom-elementor-addons' ),
'icon' => 'eicon-text-align-left',
],
'center' => [
'title' => esc_html__( 'Center', 'wpzoom-elementor-addons' ),
'icon' => 'eicon-text-align-center',
],
'right' => [
'title' => esc_html__( 'Right', 'wpzoom-elementor-addons' ),
'icon' => 'eicon-text-align-right',
],
],
'toggle' => true,
'default' => 'center'
]
);

$this->add_control(
'slideshow_align_vertical',
[
'label' => esc_html__( 'Content Position (Vertical)', 'wpzoom-elementor-addons' ),
'type' => Controls_Manager::CHOOSE,
'label_block' => false,
'options' => [
'bottom' => [
'title' => esc_html__( 'Bottom', 'wpzoom-elementor-addons' ),
'icon' => 'eicon-v-align-bottom',
],
'middle' => [
'title' => esc_html__( 'Middle', 'wpzoom-elementor-addons' ),
'icon' => 'eicon-v-align-middle',
],
],

'condition' => array(
'slideshow_align!' => 'center',
),
'toggle' => true,
'default' => 'middle'
]
);


}


/* Option for Inspiro PRO*/
if( 'wpzoom-inspiro-pro' === $current_theme ) {

Expand Down Expand Up @@ -897,12 +954,7 @@ protected function render() {
$align = isset( $settings['slideshow_align'] ) ? $settings['slideshow_align'] : '';
$align_vertical = isset( $settings['slideshow_align_vertical'] ) ? $settings['slideshow_align_vertical'] : '';

/* Option for Inspiro PRO*/
if( 'wpzoom-inspiro-pro' === $current_theme ) {
$this->add_render_attribute( '_li-wrap', 'class', 'li-wrap wpz-' . $align . '-slider-wrap wpz-' . $align_vertical . '-slider-wrap' );
} else {
$this->add_render_attribute( '_li-wrap', 'class', 'li-wrap' );
}
$this->add_render_attribute( '_li-wrap', 'class', 'li-wrap wpz-' . $align . '-slider-wrap wpz-' . $align_vertical . '-slider-wrap' );

$this->add_render_attribute( '_slide_title', 'class', [ $settings['hide_title_desktop'], $settings['hide_title_tablet'], $settings['hide_title_mobile'] ] );

Expand Down Expand Up @@ -1041,7 +1093,7 @@ protected function render() {

<?php
/* Markup for Inspiro PRO*/
if( 'wpzoom-inspiro-pro' === $current_theme && 'center' != $align ) { ?>
if( ('wpzoom-inspiro-pro' === $current_theme && 'center' != $align ) || ('inspiro' === $current_theme && 'bottom' === $align_vertical ) ) { ?>

<?php if($popup_video_type === 'self_hosted' && $is_video_popup): ?>
<div id="zoom-popup-<?php echo get_the_ID(); ?>" class="animated slow mfp-hide" data-src ="<?php echo esc_url( $popup_final_external_src ); ?>">
Expand Down Expand Up @@ -1103,7 +1155,7 @@ protected function render() {
?>
<?php
/* Markup for Inspiro Premium*/
if( ( 'inspiro' === $current_theme && class_exists( 'WPZOOM' ) ) || ( 'wpzoom-inspiro-pro' === $current_theme && $align == 'center' ) ) {
if( ( 'inspiro' === $current_theme && class_exists( 'WPZOOM' ) && $align_vertical != 'bottom' ) || ( 'wpzoom-inspiro-pro' === $current_theme && $align == 'center' ) ) {
?>
<?php if($popup_video_type === 'self_hosted' && $is_video_popup): ?>
<div id="zoom-popup-<?php echo get_the_ID(); ?>" class="animated slow mfp-hide" data-src ="<?php echo $popup_final_external_src ?>">
Expand Down
2 changes: 1 addition & 1 deletion includes/widgets/team-members/css/frontend.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.wpz-member > .elementor-widget-container {
.elementor-widget-wpzoom-elementor-addons-team-members {
padding: 25px;
border-radius: 5px;
background-color: #fff;
Expand Down
2 changes: 1 addition & 1 deletion includes/widgets/woo-products/frontend.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
box-sizing: content-box;
}

.elementor-widget-wpzoom-elementor-addons-woo-products .woocommerce .elementor-widget-container .wpcf7 label {
.elementor-widget-wpzoom-elementor-addons-woo-products .woocommerce .wpcf7 label {
width: 100%;
}

Expand Down

0 comments on commit 9b2ce77

Please sign in to comment.