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.

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

✨ new(rating): adding rating element in FUI. #68

Merged
merged 23 commits into from
Jun 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b1a7cb0
🐛 fix(ui): FUI select and ui design improvements.
creador-dev May 6, 2024
8e94878
revert .min file changes
creador-dev May 6, 2024
2722f10
✨ new(multiselect): multiselect new variation added.
creador-dev May 10, 2024
9f760f5
✨ new(multiselect): multiselect styling for multiple appearances.
creador-dev May 13, 2024
de6f211
✨ new(multiselect): multiselect new varaiotion select2.
creador-dev May 14, 2024
74b3aef
🐛 fix(select2): cleaning up select2 library.
creador-dev May 14, 2024
005c680
🐛 fix(select2): cleaning up select2 library.
creador-dev May 14, 2024
562df80
✨ new(multiselect): multiselect docs updated.
creador-dev May 15, 2024
67e8f2b
reverted .min files.
creador-dev May 15, 2024
d7756e9
✨ new(multiselect): multiselect docs updated.
creador-dev May 15, 2024
9a5df89
✨ new(multiselect): multiselect styles updated.
creador-dev May 15, 2024
1744c83
✨ new(icons): adding rating icons.
creador-dev Jun 4, 2024
c49ef6b
✨ new(rating): adding rating element in FUI.
creador-dev Jun 6, 2024
bbf72ee
✨ new(rating): adding rating element in FUI.
creador-dev Jun 6, 2024
5fc1f00
✨ new(rating): adding rating icon color fix.
creador-dev Jun 6, 2024
d760e6a
✨ new(rating): adding rating improvements.
creador-dev Jun 6, 2024
9970bf3
✨ new(rating): rating field smile icon updated.
creador-dev Jun 7, 2024
39fb539
✨ new(rating): rating field js updated.
creador-dev Jun 7, 2024
c2ac545
✨ new(rating): rating field js updated.
creador-dev Jun 7, 2024
0e68b65
✨ new(rating): rating field js updated.
creador-dev Jun 7, 2024
9f50085
🐛 fix(rating): rating field events getting called unnecessarily.
creador-dev Jun 10, 2024
60d1b82
🐛 fix(rating): rating field design fixes.
creador-dev Jun 10, 2024
eeeca15
🐛 fix(rating): rating field design fixes.
creador-dev Jun 10, 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
Binary file modified assets/fonts/forminator-icons-font.eot
Binary file not shown.
6 changes: 5 additions & 1 deletion assets/fonts/forminator-icons-font.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified assets/fonts/forminator-icons-font.ttf
Binary file not shown.
Binary file modified assets/fonts/forminator-icons-font.woff
Binary file not shown.
Binary file modified assets/fonts/forminator-icons-font.woff2
Binary file not shown.
7 changes: 6 additions & 1 deletion assets/js/public/forms-section-elements.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
const select = $( this ).find( '.forminator-select' );
const select2 = $( this ).find( '.forminator-select2' );
const slider = $( this ).find( '.forminator-slider' );
const rating = $( this ).find( '.forminator-rating' );

// Unique id
SHOWCASE.uniqueFormField( this );
Expand Down Expand Up @@ -80,11 +81,15 @@
FUI.select2();
}

// Load rating field.
if ( rating.length ) {
FUI.rating( rating );
}

// Load radio and checkbox function
FUI.radioStates( radio );
FUI.checkboxStates( checkbox );
FUI.multiSelectStates( multiselect );

});
});
}
Expand Down
24 changes: 24 additions & 0 deletions assets/scss/forms-appearance/_default.scss
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,30 @@
color: $dropdown-active--color;
}
}

&[aria-multiselectable="true"] {
.select2-results__option--selected {
background-color: $dropdown-active--background;
color: $dropdown-active--color;

.forminator-checkbox {
.forminator-checkbox-box {
border-color: $dropdown-active--background;
}
}
}
}
}
}

// Checkbox in dropdown
.forminator-checkbox {
.forminator-checkbox-box {
background: $dropdown-active--color;

&::before {
color: $dropdown-active--background;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion form-ui.html
Original file line number Diff line number Diff line change
Expand Up @@ -1046,7 +1046,7 @@ <h1>Forminator Forms</h1>
<div class="forminator-field">
<label class="forminator-label">Field label <span class="forminator-required">*</span></label>
<select placeholder="Placeholder"
class="forminator-select">
class="forminator-select2">
<option>Option 1</option>
<option>Option 2</option>
<option>Option 3</option>
Expand Down
4 changes: 3 additions & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ library.watch.scripts.all = [
library.source.scripts + 'select2.js',
library.source.scripts + 'authentication.js',
library.source.scripts + 'slider.js',
library.source.scripts + 'rating.js',
library.source.scripts + 'poll-chart.js',
library.source.scripts + 'form-submit.js'
];
Expand All @@ -116,7 +117,8 @@ library.watch.scripts.form = [
library.source.scripts + 'multiselect-states.js',
library.source.scripts + 'select2.js',
library.source.scripts + 'authentication.js',
library.source.scripts + 'slider.js'
library.source.scripts + 'slider.js',
library.source.scripts + 'rating.js'
];

library.watch.scripts.poll = [
Expand Down
Binary file modified library/fonts/forminator-icons-font.eot
Binary file not shown.
6 changes: 5 additions & 1 deletion library/fonts/forminator-icons-font.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified library/fonts/forminator-icons-font.ttf
Binary file not shown.
Binary file modified library/fonts/forminator-icons-font.woff
Binary file not shown.
Binary file modified library/fonts/forminator-icons-font.woff2
Binary file not shown.
Loading