Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion classes/helpers/FrmFieldsHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -2440,7 +2440,7 @@ public static function render_ai_generate_options_button( $args, $should_hide_bu
$attributes = array( 'class' => self::get_ai_generate_options_button_class() );

if ( ! empty( $should_hide_bulk_edit ) ) {
$attributes['class'] .= ' frm_hidden!';
$attributes['class'] .= ' frm-force-hidden';
}

$data = FrmAppHelper::get_upgrade_data_params(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ class="frm-has-modal frm-default-value-wrapper default-value-section-<?php echo
<?php $field_obj->echo_field_default_setting_attributes( $field ); ?>
id="default-value-for-<?php echo esc_attr( $field['id'] ); ?>"
>
<label class="frm-flex! frm-gap-xs frm-items-center" for="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>">
<label class="frm-force-flex frm-gap-xs frm-items-center" for="frm_default_value_<?php echo esc_attr( $field['id'] ); ?>">
<span><?php esc_html_e( 'Default Value', 'formidable' ); ?></span>
<?php FrmAppHelper::tooltip_icon( __( 'Pre-fill your field with this value. Users can modify it unless the field is read-only.', 'formidable' ), array( 'class' => 'frm-flex' ) ); ?>
</label>
Expand Down
2 changes: 1 addition & 1 deletion classes/views/frm-fields/back-end/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@

<?php if ( $display['show_image'] ) { ?>
<p class="frm_form_field">
<label class="frm-flex! frm-gap-xs" for="frm_show_image_<?php echo esc_attr( $field['id'] ); ?>">
<label class="frm-force-flex frm-gap-xs" for="frm_show_image_<?php echo esc_attr( $field['id'] ); ?>">
<input class="frm-m-0" type="checkbox" id="frm_show_image_<?php echo esc_attr( $field['id'] ); ?>" name="field_options[show_image_<?php echo esc_attr( $field['id'] ); ?>]" value="1" <?php checked( $field['show_image'], 1 ); ?> />
<span class="-frm-mt-2xs"><?php esc_html_e( 'If this URL points to an image, show to image on the entries listing page.', 'formidable' ); ?></span>
</label>
Expand Down
2 changes: 1 addition & 1 deletion classes/views/styles/components/templates/text-toggle.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
checked( ( $is_default_checked && 0 === $index ) || $option['value'] == $field_value, true );
?>
/>
<label class="frm-flex-center! <?php echo esc_attr( $option['classes'] ?? '' ); ?>" for="<?php echo esc_attr( $input_attrs['id'] ); ?>" tabindex="0" data-value="<?php echo esc_attr( $input_attrs['value'] ); ?>" <?php echo $option['custom_attrs'] ?? ''; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>>
<label class="frm-force-flex-center <?php echo esc_attr( $option['classes'] ?? '' ); ?>" for="<?php echo esc_attr( $input_attrs['id'] ); ?>" tabindex="0" data-value="<?php echo esc_attr( $input_attrs['value'] ); ?>" <?php echo $option['custom_attrs'] ?? ''; // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>>
<span class="frm-toggle-label"><?php echo esc_html( $option['label'] ?? '' ); ?></span>
</label>
<?php
Expand Down
2 changes: 1 addition & 1 deletion css/frm_admin.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/addons-page.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/form-templates.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable-settings-components.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_admin.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_dashboard.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/formidable_overlay.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/onboarding-wizard.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/src/admin/admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -5126,7 +5126,7 @@ function frmAdminBuildJS() {
watchRowBlock.fadeIn( 'slow' );

// Show the "Watch Lookup Fields" label if it was hidden
document.getElementById( `frm_watch_lookup_label_${ id }` )?.classList.remove( 'frm_hidden!' );
document.getElementById( `frm_watch_lookup_label_${ id }` )?.classList.remove( 'frm-force-hidden' );
}
} );
return false;
Expand Down
4 changes: 2 additions & 2 deletions resources/scss/admin/utilities/layout/_display.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Utilities - Display
*/

#wpwrap .frm_hidden\! {
#wpwrap .frm-force-hidden {
display: none !important;
}

Expand All @@ -15,7 +15,7 @@
display: inline;
}

.frm-inline\! {
.frm-force-inline {
display: inline !important;
}

Expand Down
8 changes: 2 additions & 6 deletions resources/scss/admin/utilities/layout/_flex.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
display: flex;
}

.frm-flex\! {
.frm-force-flex {
display: flex !important;
}

Expand Down Expand Up @@ -47,7 +47,7 @@
@extend %frm-flex-center;
}

.frm-flex-center\! {
.frm-force-flex-center {
display: flex !important;

@extend %frm-flex-center;
Expand All @@ -69,10 +69,6 @@
gap: var(--gap-xs);
}

.frm-gap-xs\! {
gap: var(--gap-xs) !important;
}

.frm-gap-sm {
gap: var(--gap-sm);
}
Expand Down
4 changes: 2 additions & 2 deletions resources/scss/admin/utilities/layout/_grid.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.frm_form_field.frm6_followed:not(.frm_hidden):not(.frm_hidden\!) {
.frm_form_field.frm6_followed:not(.frm_hidden):not(.frm-force-hidden) {

+ p,
+ div,
Expand All @@ -8,7 +8,7 @@
}
}

.frm_form_field.frm12_followed:not(.frm_hidden):not(.frm_hidden\!) {
.frm_form_field.frm12_followed:not(.frm_hidden):not(.frm-force-hidden) {

+ p,
+ div,
Expand Down
2 changes: 1 addition & 1 deletion resources/scss/admin/utilities/spacing/_margin.scss
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
margin-right: auto;
}

.frm-mr-auto\! {
.frm-force-mr-auto {
margin-right: auto !important;
}

Expand Down
4 changes: 2 additions & 2 deletions tests/cypress/e2e/Forms/formsSettings.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe( 'Updating form settings', () => {

cy.log( 'Verify URL redirect after submitting form' );
cy.origin( 'https://formidableforms.com', () => {
cy.location( 'href', { timeout: 10000 } ).should( 'include', 'https://formidableforms.com/' );
cy.location( 'href', { timeout: 10000 } ).should( 'include', 'https://formidableforms.com/' );
} );

cy.log( 'Navigate back to the formidable form page' );
Expand All @@ -141,7 +141,7 @@ describe( 'Updating form settings', () => {

cy.log( 'Verify URL redirect after submitting form' );
cy.origin( 'https://formidableforms.com', () => {
cy.location( 'href', { timeout: 10000 } ).should( 'include', 'https://formidableforms.com/' );
cy.location( 'href', { timeout: 10000 } ).should( 'include', 'https://formidableforms.com/' );
} );

cy.log( 'Navigate back to the formidable form page' );
Expand Down
Loading