Skip to content

Stop using font icon in section field icons in form builder #2146

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

Merged
Crabcyborg merged 11 commits into from
Dec 3, 2024
Merged

Stop using font icon in section field icons in form builder #2146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6e8fb61
Stop using font icon in section field icons
AbdiTolesa Nov 29, 2024
cebc4b3
Replace font icon used in bottom left corner
AbdiTolesa Nov 29, 2024
831715b
Remove obsolete style now
AbdiTolesa Nov 29, 2024
3c74b13
Add hover and selected styles
AbdiTolesa Nov 29, 2024
18de8f9
Remove useless fill css value
AbdiTolesa Nov 29, 2024
3542f40
Make styles apply to intended icons only
AbdiTolesa Dec 2, 2024
23594af
Modify a function to be used both with AJAX and regular requests
AbdiTolesa Dec 3, 2024
61d2b15
Modify a function to be used both with AJAX and regular requests
AbdiTolesa Dec 3, 2024
3c2aca2
Fix PHPCS error
AbdiTolesa Dec 3, 2024
96fcf09
Undo changes from another branch
AbdiTolesa Dec 3, 2024
b518285
Fix PHPCS error
AbdiTolesa Dec 3, 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
6 changes: 5 additions & 1 deletion classes/views/frm-forms/add_field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
}
?>
<li id="frm_field_id_<?php echo esc_attr( $field['id'] ); ?>" class="<?php echo esc_attr( $li_classes ); ?>" data-fid="<?php echo esc_attr( $field['id'] ); ?>" data-formid="<?php echo esc_attr( 'divider' === $field['type'] ? $field['form_select'] : $field['form_id'] ); ?>" data-ftype="<?php echo esc_attr( $display['type'] ); ?>" data-type="<?php echo esc_attr( $field['type'] ); ?>">
<?php if ( $field['type'] === 'divider' ) { ?>
<?php
if ( $field['type'] === 'divider' ) {
FrmAppHelper::icon_by_class( 'frmfont frm-form-title-style frm-divider-icon' );
?>
<div class="divider_section_only">
<?php } ?>

Expand Down Expand Up @@ -98,6 +101,7 @@
</div>
<ul class="start_divider frm_sorting frm_grid_container">
<?php
FrmAppHelper::icon_by_class( 'frmfont frm-circle frm-divider-icon' );
} elseif ( 'end_divider' === $field['type'] ) {
?>
</ul>
Expand Down
58 changes: 27 additions & 31 deletions css/frm_admin.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6560,8 +6560,6 @@ li.selected .divider_section_only:before {
position: relative;
}

.edit_field_type_divider:before,
.edit_field_type_divider:after,
.frm-page-break:before,
.frm-page-break:after {
content: '';
Expand All @@ -6573,30 +6571,39 @@ li.selected .divider_section_only:before {
-webkit-font-smoothing: antialiased;
}

.edit_field_type_divider:before {
font-family: 's11-fp';
content: '\f1dc';
width: 20px;
height: 20px;
left: -11px;
top: 0;
background: var(--primary-700);
text-align: center;
color: #fff;
font-size: 13px;
}

.repeat_section.edit_field_type_divider:before {
font-family: 's11-fp';
content: '\f363';
}

.edit_field_type_divider:after {
width: 5px;
height: 5px;
left: -4px;
.edit_field_type_divider .frm-divider-icon.frmsvg {
padding: 2px;
position: absolute;
left: -12px;
color: #fff;
background-color: var(--primary-700);
border-radius: 50%;
}

.edit_field_type_divider .start_divider .frm-divider-icon.frmsvg {
height: 8px;
width: 8px;
padding: 0;
bottom: -4px;
transition: all 0.4s ease-out;
left: -24.5px;
color: var(--primary-700);
background-color: #fff;
}

.edit_field_type_divider.selected .frm-divider-icon.frmsvg,
.edit_field_type_divider:hover .frm-divider-icon.frmsvg {
background: var(--primary-500);
}

.edit_field_type_divider.selected .start_divider .frm-divider-icon.frmsvg,
.edit_field_type_divider:hover .start_divider .frm-divider-icon.frmsvg {
background-color: #fff;
color: var(--primary-500);
}

.frm-page-break:before,
Expand Down Expand Up @@ -6624,17 +6631,6 @@ li.selected .divider_section_only:before {
border-left-color: var(--primary-500);
}

.edit_field_type_divider.selected:before,
.edit_field_type_divider:hover:before {
border-color: var(--primary-500);
background: var(--primary-500);
}

.edit_field_type_divider.selected:after,
.edit_field_type_divider:hover:after {
border-color: var(--primary-500);
}

.frm-section-collapsed:after {
border-color: transparent !important;
color: transparent;
Expand Down