| @@ -235,35 +235,24 @@ | ||
| 235 | 235 | 'position', |
| 236 | 236 | [ |
| 237 | 237 | 'label' => esc_html__( 'Icon Position', 'elementor' ), |
| 238 | 238 | 'type' => Controls_Manager::CHOOSE, |
| 239 | - 'default' => 'block-start', | |
| 240 | - 'mobile_default' => 'block-start', | |
| 239 | + 'default' => 'top', | |
| 240 | + 'mobile_default' => 'top', | |
| 241 | 241 | 'options' => [ |
| 242 | - 'inline-start' => [ | |
| 243 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 242 | + 'left' => [ | |
| 243 | + 'title' => esc_html__( 'Left', 'elementor' ), | |
| 244 | 244 | 'icon' => 'eicon-h-align-left', |
| 245 | 245 | ], |
| 246 | - 'inline-end' => [ | |
| 247 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 248 | - 'icon' => 'eicon-h-align-right', | |
| 249 | - ], | |
| 250 | - 'block-start' => [ | |
| 246 | + 'top' => [ | |
| 251 | 247 | 'title' => esc_html__( 'Top', 'elementor' ), |
| 252 | 248 | 'icon' => 'eicon-v-align-top', |
| 253 | 249 | ], |
| 254 | - 'block-end' => [ | |
| 255 | - 'title' => esc_html__( 'Bottom', 'elementor' ), | |
| 256 | - 'icon' => 'eicon-v-align-bottom', | |
| 250 | + 'right' => [ | |
| 251 | + 'title' => esc_html__( 'Right', 'elementor' ), | |
| 252 | + 'icon' => 'eicon-h-align-right', | |
| 257 | 253 | ], |
| 258 | 254 | ], |
| 259 | - 'classes' => 'elementor-control-start-end', | |
| 260 | - 'classes_dictionary' => [ | |
| 261 | - 'left' => is_rtl() ? 'inline-end' : 'inline-start', | |
| 262 | - 'right' => is_rtl() ? 'inline-start' : 'inline-end', | |
| 263 | - 'top' => 'block-start', | |
| 264 | - 'bottom' => 'block-end', | |
| 265 | - ], | |
| 266 | 255 | 'prefix_class' => 'elementor%s-position-', |
| 267 | 256 | 'condition' => [ |
| 268 | 257 | 'selected_icon[value]!' => '', |
| 269 | 258 | ], |
| @@ -299,9 +288,9 @@ | ||
| 299 | 288 | '{{WRAPPER}} .elementor-icon-box-wrapper' => 'align-items: {{VALUE}};', |
| 300 | 289 | ], |
| 301 | 290 | 'condition' => [ |
| 302 | 291 | 'selected_icon[value]!' => '', |
| 303 | - 'position' => [ 'left', 'right', 'inline-start', 'inline-end' ], | |
| 292 | + 'position' => [ 'left', 'right' ], | |
| 304 | 293 | ], |
| 305 | 294 | ] |
| 306 | 295 | ); |
| 307 | 296 | |
| @@ -310,10 +299,10 @@ | ||
| 310 | 299 | [ |
| 311 | 300 | 'label' => esc_html__( 'Alignment', 'elementor' ), |
| 312 | 301 | 'type' => Controls_Manager::CHOOSE, |
| 313 | 302 | 'options' => [ |
| 314 | - 'start' => [ | |
| 315 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 303 | + 'left' => [ | |
| 304 | + 'title' => esc_html__( 'Left', 'elementor' ), | |
| 316 | 305 | 'icon' => 'eicon-text-align-left', |
| 317 | 306 | ], |
| 318 | 307 | 'center' => [ |
| 319 | 308 | 'title' => esc_html__( 'Center', 'elementor' ), |
| @@ -318,10 +307,10 @@ | ||
| 318 | 307 | 'center' => [ |
| 319 | 308 | 'title' => esc_html__( 'Center', 'elementor' ), |
| 320 | 309 | 'icon' => 'eicon-text-align-center', |
| 321 | 310 | ], |
| 322 | - 'end' => [ | |
| 323 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 311 | + 'right' => [ | |
| 312 | + 'title' => esc_html__( 'Right', 'elementor' ), | |
| 324 | 313 | 'icon' => 'eicon-text-align-right', |
| 325 | 314 | ], |
| 326 | 315 | 'justify' => [ |
| 327 | 316 | 'title' => esc_html__( 'Justified', 'elementor' ), |
| @@ -327,13 +316,8 @@ | ||
| 327 | 316 | 'title' => esc_html__( 'Justified', 'elementor' ), |
| 328 | 317 | 'icon' => 'eicon-text-align-justify', |
| 329 | 318 | ], |
| 330 | 319 | ], |
| 331 | - 'classes' => 'elementor-control-start-end', | |
| 332 | - 'selectors_dictionary' => [ | |
| 333 | - 'left' => is_rtl() ? 'end' : 'start', | |
| 334 | - 'right' => is_rtl() ? 'start' : 'end', | |
| 335 | - ], | |
| 336 | 320 | 'selectors' => [ |
| 337 | 321 | '{{WRAPPER}} .elementor-icon-box-wrapper' => 'text-align: {{VALUE}};', |
| 338 | 322 | ], |
| 339 | 323 | 'separator' => 'after', |
| @@ -360,9 +344,9 @@ | ||
| 360 | 344 | 'max' => 10, |
| 361 | 345 | ], |
| 362 | 346 | ], |
| 363 | 347 | 'selectors' => [ |
| 364 | - '{{WRAPPER}} .elementor-icon-box-wrapper' => 'gap: {{SIZE}}{{UNIT}};', | |
| 348 | + '{{WRAPPER}}' => '--icon-box-icon-margin: {{SIZE}}{{UNIT}}', | |
| 365 | 349 | ], |
| 366 | 350 | 'condition' => [ |
| 367 | 351 | 'selected_icon[value]!' => '', |
| 368 | 352 | ], |
| @@ -902,9 +886,9 @@ | ||
| 902 | 886 | if ( ! hasIcon && ! hasContent ) { |
| 903 | 887 | return; |
| 904 | 888 | } |
| 905 | 889 | |
| 906 | - var hasLink = settings.link?.url, | |
| 890 | + var hasLink = settings.link.url, | |
| 907 | 891 | htmlTag = hasLink ? 'a' : 'span', |
| 908 | 892 | iconHTML = elementor.helpers.renderIcon( view, settings.selected_icon, { 'aria-hidden': true }, 'i' , 'object' ), |
| 909 | 893 | migrated = elementor.helpers.isIconMigrated( settings, 'selected_icon' ), |
| 910 | 894 | titleSizeTag = elementor.helpers.validateHTMLTag( settings.title_size ); |
| @@ -915,9 +899,9 @@ | ||
| 915 | 899 | view.addRenderAttribute( 'icon', 'class', 'elementor-animation-' + settings.hover_animation ); |
| 916 | 900 | } |
| 917 | 901 | |
| 918 | 902 | if ( hasLink ) { |
| 919 | - view.addRenderAttribute( 'link', 'href', elementor.helpers.sanitizeUrl( settings.link?.url ) ); | |
| 903 | + view.addRenderAttribute( 'link', 'href', elementor.helpers.sanitizeUrl( settings.link.url ) ); | |
| 920 | 904 | view.addRenderAttribute( 'icon', 'tabindex', '-1' ); |
| 921 | 905 | if ( '' !== settings.title_text ) { |
| 922 | 906 | view.addRenderAttribute( 'icon', 'aria-label', settings.title_text ); |
| 923 | 907 | } |
| @@ -965,27 +949,6 @@ | ||
| 965 | 949 | } |
| 966 | 950 | |
| 967 | 951 | public function on_import( $element ) { |
| 968 | 952 | return Icons_Manager::on_import_migration( $element, 'icon', 'selected_icon', true ); |
| 969 | - } | |
| 970 | - | |
| 971 | - public function render_markdown(): string { | |
| 972 | - $settings = $this->get_settings_for_display(); | |
| 973 | - $title = Utils::html_to_plain_text( $settings['title_text'] ?? '' ); | |
| 974 | - $description = Utils::html_to_plain_text( $settings['description_text'] ?? '' ); | |
| 975 | - if ( empty( $title ) && empty( $description ) ) { | |
| 976 | - return ''; | |
| 977 | - } | |
| 978 | - $parts = []; | |
| 979 | - if ( ! empty( $title ) ) { | |
| 980 | - if ( ! empty( $settings['link']['url'] ) ) { | |
| 981 | - $parts[] = '### [' . $title . '](' . esc_url( $settings['link']['url'] ) . ')'; | |
| 982 | - } else { | |
| 983 | - $parts[] = '### ' . $title; | |
| 984 | - } | |
| 985 | - } | |
| 986 | - if ( ! empty( $description ) ) { | |
| 987 | - $parts[] = $description; | |
| 988 | - } | |
| 989 | - return implode( "\n\n", $parts ); | |
| 990 | 953 | } |
| 991 | 954 | } |