Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix border styles for underline styles #2027

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix border styles for underline styles #2027

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dadfde2
Fix border styles for underline styles
AbdiTolesa Oct 4, 2024
37d4f9d
Sanitize field_border_width
AbdiTolesa Oct 4, 2024
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
35 changes: 22 additions & 13 deletions css/_single_theme.css.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,29 @@
}

<?php if ( FrmAppHelper::pro_is_installed() ) : ?>
.<?php echo esc_html( $style_class ); ?> .frm_scale label{
<?php if ( ! empty( $check_weight ) ) { ?>
font-weight:<?php echo esc_html( $check_weight . $important ); ?>;
<?php } ?>
<?php if ( ! empty( $font ) ) { ?>
font-family:<?php echo FrmAppHelper::kses( $font . $important ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>;
<?php } ?>
<?php if ( ! empty( $check_font_size ) ) { ?>
font-size:<?php echo esc_html( $check_font_size . $important ); ?>;
<?php } ?>
<?php if ( ! empty( $check_label_color ) ) { ?>
color:<?php echo esc_html( $check_label_color . $important ); ?>;
.<?php echo esc_html( $style_class ); ?> .frm_scale label{
<?php if ( ! empty( $check_weight ) ) { ?>
font-weight:<?php echo esc_html( $check_weight . $important ); ?>;
<?php } ?>
<?php if ( ! empty( $font ) ) { ?>
font-family:<?php echo FrmAppHelper::kses( $font . $important ); // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped ?>;
<?php } ?>
<?php if ( ! empty( $check_font_size ) ) { ?>
font-size:<?php echo esc_html( $check_font_size . $important ); ?>;
<?php } ?>
<?php if ( ! empty( $check_label_color ) ) { ?>
color:<?php echo esc_html( $check_label_color . $important ); ?>;
<?php } ?>
}
<?php
if ( ! empty( $field_border_width ) && false !== strpos( $field_border_width, ' ' ) ) {
$border_width = explode( ' ', str_replace( 'px', '', esc_html( $field_border_width ) ) );
$border_width = max( $border_width ) . 'px';
?>
.<?php echo esc_html( $style_class ); ?> .frm_image_options .frm_image_option_container {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @AbdiTolesa.

Is it possible to do this update in Pro instead? Ideally any references to frm_image_option_container can be done in Pro, since displaying radio buttons/checkboxes as images is a Pro feature.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just realized we can do that in single-style.css in Pro and I have done that but I think you haven't seen my question on this solution in the Pro PR: https://github.com/Strategy11/formidable-pro/pull/4771#discussion_r1787431210

border-width:<?php echo esc_html( $border_width . $important ); ?>;
}
<?php } ?>
}
<?php endif; ?>

/* These do not work if they are combined */
Expand Down
Loading