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/FrmStylesHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ function ( $key ) use ( $defaults, $font_size, $base_font_size, &$settings ) {
* @return float
*/
private static function get_base_font_size_scale( $key, $value, $defaults ) {
if ( empty( $defaults[ $key ] ) || ! is_numeric( (int) $defaults[ $key ] ) || ! is_numeric( (int) $value ) ) {
if ( empty( $defaults[ $key ] ) || ! is_numeric( (int) $defaults[ $key ] ) || ! is_numeric( (int) $value ) || 0 === (int) $value ) {
return 1;
}

Expand Down
86 changes: 68 additions & 18 deletions classes/views/styles/_buttons.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
);
?>
<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?></label>
<label
for="frm_submit_text_color"
class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -49,7 +51,11 @@
?>
</div>

<div class="frm5 frm_form_field"><label class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label></div>
<div class="frm5 frm_form_field">
<label
for="frm_submit_font_size"
class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
new FrmSliderStyleComponent(
Expand All @@ -64,7 +70,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Weight', 'formidable' ); ?></label>
<label
for="frm_submit_weight"
class="frm-style-item-heading"><?php esc_html_e( 'Weight', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -79,7 +87,11 @@
?>
</div>

<div class="frm5 frm_form_field"><label class="frm-style-item-heading"><?php esc_html_e( 'Width', 'formidable' ); ?></label></div>
<div class="frm5 frm_form_field">
<label
for="frm_submit_width"
class="frm-style-item-heading"><?php esc_html_e( 'Width', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
new FrmSliderStyleComponent(
Expand All @@ -94,7 +106,11 @@
?>
</div>

<div class="frm5 frm_form_field"><label class="frm-style-item-heading"><?php esc_html_e( 'Height', 'formidable' ); ?></label></div>
<div class="frm5 frm_form_field">
<label
for="frm_submit_height"
class="frm-style-item-heading"><?php esc_html_e( 'Height', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
new FrmSliderStyleComponent(
Expand All @@ -109,7 +125,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' ); ?></label>
<label
for="frm_submit_border_color"
class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -124,7 +142,11 @@
?>
</div>

<div class="frm5 frm_form_field"><label class="frm-style-item-heading"><?php esc_html_e( 'Border Width', 'formidable' ); ?></label></div>
<div class="frm5 frm_form_field">
<label
for="frm_submit_border_width"
class="frm-style-item-heading"><?php esc_html_e( 'Border Width', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
new FrmSliderStyleComponent(
Expand All @@ -139,7 +161,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Shadow', 'formidable' ); ?></label>
<label
for="frm_submit_shadow_color"
class="frm-style-item-heading"><?php esc_html_e( 'Shadow', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -154,7 +178,11 @@
?>
</div>

<div class="frm5 frm_form_field"><label class="frm-style-item-heading"><?php esc_html_e( 'Corner Radius', 'formidable' ); ?></label></div>
<div class="frm5 frm_form_field">
<label
for="frm_submit_border_radius"
class="frm-style-item-heading"><?php esc_html_e( 'Corner Radius', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
new FrmSliderStyleComponent(
Expand All @@ -169,7 +197,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading">
<label
for="frm_submit_margin"
class="frm-style-item-heading">
<?php esc_html_e( 'Margin', 'formidable' ); ?>
<span class="frm_help frm_icon_font frm_tooltip_icon" data-placement="right" data-container="body" data-original-title="<?php esc_attr_e( 'Used for navigation buttons too', 'formidable' ); ?>"></span>
</label>
Expand All @@ -188,7 +218,13 @@
?>
</div>

<div class="frm5 frm_form_field"><label class="frm-style-item-heading"><?php esc_html_e( 'Padding', 'formidable' ); ?></label></div>
<div class="frm5 frm_form_field">
<label
for="frm_submit_padding"
class="frm-style-item-heading">
<?php esc_html_e( 'Padding', 'formidable' ); ?>
</label>
</div>
<div class="frm7 frm_form_field">
<?php
new FrmSliderStyleComponent(
Expand All @@ -204,7 +240,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading">
<label
for="frm_submit_style"
class="frm-style-item-heading">
<?php esc_html_e( 'Disable submit button styling', 'formidable' ); ?>
<?php FrmAppHelper::tooltip_icon( __( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ); ?>
</label>
Expand All @@ -229,7 +267,9 @@
<div class="frm-active">
<div class="frm_grid_container">
<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'BG Color', 'formidable' ); ?></label>
<label
for="frm_submit_hover_bg_color"
class="frm-style-item-heading"><?php esc_html_e( 'BG Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -245,7 +285,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?></label>
<label
for="frm_submit_hover_color"
class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -261,7 +303,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' ); ?></label>
<label
for="frm_submit_hover_border_color"
class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -281,7 +325,9 @@
<div class="frm-active">
<div class="frm_grid_container">
<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'BG Color', 'formidable' ); ?></label>
<label
for="frm_submit_active_bg_color"
class="frm-style-item-heading"><?php esc_html_e( 'BG Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -297,7 +343,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?></label>
<label
for="frm_submit_active_color"
class="frm-style-item-heading"><?php esc_html_e( 'Font Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -313,7 +361,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' ); ?></label>
<label
for="frm_submit_active_border_color"
class="frm-style-item-heading"><?php esc_html_e( 'Border Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand Down
20 changes: 15 additions & 5 deletions classes/views/styles/_check-box-radio-fields.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
}
?>
<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Color', 'formidable' ); ?></label>
<label
for="frm_check_label_color"
class="frm-style-item-heading"><?php esc_html_e( 'Color', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -20,7 +22,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
<label
for="frm_check_font_size"
class="frm-style-item-heading"><?php esc_html_e( 'Font Size', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -36,7 +40,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Weight', 'formidable' ); ?></label>
<label
for="frm_check_weight"
class="frm-style-item-heading"><?php esc_html_e( 'Weight', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -52,7 +58,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Check Box', 'formidable' ); ?></label>
<label
for="frm_check_align"
class="frm-style-item-heading"><?php esc_html_e( 'Check Box', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand All @@ -71,7 +79,9 @@
</div>

<div class="frm5 frm_form_field">
<label class="frm-style-item-heading"><?php esc_html_e( 'Radio', 'formidable' ); ?></label>
<label
for="frm_radio_align"
class="frm-style-item-heading"><?php esc_html_e( 'Radio', 'formidable' ); ?></label>
</div>
<div class="frm7 frm_form_field">
<?php
Expand Down
Loading