| @@ -160,9 +160,9 @@ | ||
| 160 | 160 | 'unit' => 'px', |
| 161 | 161 | ], |
| 162 | 162 | 'separator' => 'before', |
| 163 | 163 | 'selectors' => [ |
| 164 | - '{{SELECTOR}}' => '--gap: {{ROW}}{{UNIT}} {{COLUMN}}{{UNIT}};--row-gap: {{ROW}}{{UNIT}};--column-gap: {{COLUMN}}{{UNIT}};', | |
| 164 | + '{{SELECTOR}}' => '--gap: {{ROW}}{{UNIT}} {{COLUMN}}{{UNIT}}', | |
| 165 | 165 | ], |
| 166 | 166 | 'responsive' => true, |
| 167 | 167 | 'conversion_map' => [ |
| 168 | 168 | 'old_key' => 'size', |
| @@ -201,36 +201,18 @@ | ||
| 201 | 201 | ]; |
| 202 | 202 | |
| 203 | 203 | $fields['align_content'] = [ |
| 204 | 204 | 'label' => esc_html__( 'Align Content', 'elementor' ), |
| 205 | - 'type' => Controls_Manager::CHOOSE, | |
| 206 | - 'label_block' => true, | |
| 205 | + 'type' => Controls_Manager::SELECT, | |
| 207 | 206 | 'default' => '', |
| 208 | 207 | 'options' => [ |
| 209 | - 'flex-start' => [ | |
| 210 | - 'title' => esc_html__( 'Start', 'elementor' ), | |
| 211 | - 'icon' => 'eicon-justify-start-v', | |
| 212 | - ], | |
| 213 | - 'center' => [ | |
| 214 | - 'title' => esc_html__( 'Middle', 'elementor' ), | |
| 215 | - 'icon' => 'eicon-justify-center-v', | |
| 216 | - ], | |
| 217 | - 'flex-end' => [ | |
| 218 | - 'title' => esc_html__( 'End', 'elementor' ), | |
| 219 | - 'icon' => 'eicon-justify-end-v', | |
| 220 | - ], | |
| 221 | - 'space-between' => [ | |
| 222 | - 'title' => esc_html__( 'Space Between', 'elementor' ), | |
| 223 | - 'icon' => 'eicon-justify-space-between-v', | |
| 224 | - ], | |
| 225 | - 'space-around' => [ | |
| 226 | - 'title' => esc_html__( 'Space Around', 'elementor' ), | |
| 227 | - 'icon' => 'eicon-justify-space-around-v', | |
| 228 | - ], | |
| 229 | - 'space-evenly' => [ | |
| 230 | - 'title' => esc_html__( 'Space Evenly', 'elementor' ), | |
| 231 | - 'icon' => 'eicon-justify-space-evenly-v', | |
| 232 | - ], | |
| 208 | + '' => esc_html__( 'Default', 'elementor' ), | |
| 209 | + 'center' => esc_html__( 'Center', 'elementor' ), | |
| 210 | + 'flex-start' => esc_html__( 'Start', 'elementor' ), | |
| 211 | + 'flex-end' => esc_html__( 'End', 'elementor' ), | |
| 212 | + 'space-between' => esc_html__( 'Space Between', 'elementor' ), | |
| 213 | + 'space-around' => esc_html__( 'Space Around', 'elementor' ), | |
| 214 | + 'space-evenly' => esc_html__( 'Space Evenly', 'elementor' ), | |
| 233 | 215 | ], |
| 234 | 216 | 'selectors' => [ |
| 235 | 217 | '{{SELECTOR}}' => '--align-content: {{VALUE}};', |
| 236 | 218 | ], |
