Skip to content

ROU-12666: Make Pickers preview react to icon library #1134

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
JoaoFerreira-FrontEnd merged 4 commits into from
Apr 27, 2026
+114 −133
Merged

ROU-12666: Make Pickers preview react to icon library #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ddd173
- delete base 64 images;
JoaoFerreira-FrontEnd Apr 23, 2026
f5db91f
- define O11 css vars
JoaoFerreira-FrontEnd Apr 23, 2026
3d91ddf
- clean and update the css to use pseudo-elements to render icons and…
JoaoFerreira-FrontEnd Apr 23, 2026
cd36c76
Merge branch 'dev' into ROU-12666
JoaoFerreira-FrontEnd Apr 27, 2026
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
128 changes: 64 additions & 64 deletions src/scripts/OSFramework/OSUI/Pattern/DatePicker/scss/_datepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
/// Import Flatpickr library styles
@import '../../../../../Providers/OSUI/SharedProviderResources/Flatpickr/scss/flatpickr';

@import 'datepicker_ss_preview_imgs';

///
.osui-datepicker {
input {
Expand Down Expand Up @@ -51,9 +49,6 @@
// Service Studio Preview
& {
-servicestudio-background-color: get-background-color('neutral-0');
-servicestudio-background-position: top center;
-servicestudio-background-repeat: no-repeat;
-servicestudio-background-size: contain;
-servicestudio-border-radius: var(--border-radius-soft);
-servicestudio-border: var(--border-size-s) solid get-border-color('neutral-5');
-servicestudio-display: inline-block;
Expand All @@ -65,39 +60,86 @@
-servicestudio-width: 100%;
-servicestudio-z-index: var(--layer-local-tier-1);

&:before,
&:after {
-servicestudio-color: var(--color-indigo);
-servicestudio-font-family: var(--osui-icon-font-family);
-servicestudio-position: absolute;
-servicestudio-height: 34px;
-servicestudio-top: var(--space-m);
-servicestudio-width: 34px;
}

&:before {
-servicestudio-content: var(--osui-icon-arrow-left);
-servicestudio-right: var(--space-xl);
}

&:after {
-servicestudio-content: var(--osui-icon-arrow-right);
-servicestudio-right: var(--space-s);
}

.osui-datepicker-calendar-ss-preview--time,
.osui-datepicker-calendar-ss-preview--today{
-servicestudio-display: none;
}

&.time12h,
&.time24h {
.osui-datepicker-calendar-ss-preview--time {
-servicestudio-text-align: center;
-servicestudio-display: block;
-servicestudio-margin-bottom: var(--space-s);
-servicestudio-position: relative;
}
}

&.time12h .osui-datepicker-calendar-ss-preview--time::before {
-servicestudio-background-color: var(--color-indigo);
-servicestudio-border-radius: var(--border-radius-soft);
-servicestudio-color: var(--color-neutral-0);
-servicestudio-content: "am";
-servicestudio-font-size: var(--font-size-xs);
-servicestudio-font-weight: var(--font-semi-bold);
-servicestudio-height: var(--space-base);
-servicestudio-line-height: var(--space-base);
-servicestudio-position: absolute;
-servicestudio-right: var(--space-s);
-servicestudio-top: 50%;
-servicestudio-transform: translateY(-50%) translateX(-50%);
-servicestudio-vertical-align: middle;
-servicestudio-width: var(--space-xl);
}


// If has not today btn
&:not(.has-today-btn) {
&.single {
-servicestudio-background-image: $calendar_single_img_base64;
-servicestudio-height: 310px;
}

&.time12h {
-servicestudio-background-image: $calendar_time12h_img_base64;
-servicestudio-height: 344px;
-servicestudio-height: 360px;
}

&.time12h,
&.time24h {
-servicestudio-background-image: $calendar_time24h_img_base64;
-servicestudio-height: 344px;
-servicestudio-height: 394px;
}
}

// If has today btn
&.has-today-btn {
&.single {
-servicestudio-background-image: $calendar_single_hasToday_img_base64;
-servicestudio-height: 344px;
-servicestudio-height: 394px;
}

&.time12h {
-servicestudio-background-image: $calendar_time12h_hasToday_img_base64;
-servicestudio-height: 390px;
&.time12h,
&.time24h {
-servicestudio-height: 440px;
}

&.time24h {
-servicestudio-background-image: $calendar_time24h_hasToday_img_base64;
-servicestudio-height: 390px;
.osui-datepicker-calendar-ss-preview--today{
display:block;
text-align: center;
font-size: var(--font-size-s);
}
}

Expand Down Expand Up @@ -127,45 +169,3 @@
-servicestudio-margin-top: -22px;
}
}

// If Hybrid IDE
///
html[data-uieditorversion^='1'] {
.osui-datepicker-calendar-ss-preview {
// If has not today btn
&:not(.has-today-btn) {
&.single {
-servicestudio-padding-top: min(300px, 100%);
-servicestudio-height: 0;
}

&.time12h {
-servicestudio-padding-top: min(344px, 100%);
-servicestudio-height: 0;
}

&.time24h {
-servicestudio-padding-top: min(344px, 100%);
-servicestudio-height: 0;
}
}

// If has today btn
&.has-today-btn {
&.single {
-servicestudio-padding-top: min(344px, 100%);
-servicestudio-height: 0;
}

&.time12h {
-servicestudio-padding-top: min(390px, 100%);
-servicestudio-height: 0;
}

&.time24h {
-servicestudio-padding-top: min(390px, 100%);
-servicestudio-height: 0;
}
}
}
}
19 changes: 0 additions & 19 deletions src/scripts/OSFramework/OSUI/Pattern/DatePicker/scss/_datepicker_ss_preview_imgs.scss
View file
Open in desktop

This file was deleted.

31 changes: 20 additions & 11 deletions src/scripts/OSFramework/OSUI/Pattern/MonthPicker/scss/_monthpicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
/// Import Flatpickr library styles
@import '../../../../../Providers/OSUI/Monthpicker/Flatpickr/scss/_flatpickr.scss';

@import 'monthpicker_ss_preview_image';

///
.osui-monthpicker {
// Service Studio Preview Container Styles
Expand All @@ -16,19 +14,10 @@

// Service Studio Preview
& {
-servicestudio-background-image: $monthpicker_img_base64;
-servicestudio-background-position: top center;
-servicestudio-background-repeat: no-repeat;
-servicestudio-background-size: contain;
-servicestudio-display: inline-block;
-servicestudio-height: 0;
-servicestudio-margin-left: -3px;
-servicestudio-margin-top: 2px;
-servicestudio-max-width: 320px;
-servicestudio-overflow: hidden;
-servicestudio-padding-top: min(250px, 100%);
-servicestudio-position: relative;
-servicestudio-width: 100%;
-servicestudio-z-index: var(--layer-local-tier-1);

& + .placeholder-ss-preview {
Expand All @@ -37,6 +26,26 @@
-servicestudio-overflow: hidden;
-servicestudio-width: 100%;
}

&:before,
&:after {
-servicestudio-color: var(--color-indigo);
-servicestudio-font-family: var(--osui-icon-font-family);
-servicestudio-position: absolute;
-servicestudio-height: 34px;
-servicestudio-top: var(--space-m);
-servicestudio-width: 34px;
}

&:before {
-servicestudio-content: var(--osui-icon-arrow-left);
-servicestudio-right: var(--space-l);
}

&:after {
-servicestudio-content: var(--osui-icon-arrow-right);
-servicestudio-right: var(--space-xs);
}
}
}

Expand Down
3 changes: 0 additions & 3 deletions src/scripts/OSFramework/OSUI/Pattern/MonthPicker/scss/_monthpicker_ss_preview_image.scss
View file
Open in desktop

This file was deleted.

53 changes: 23 additions & 30 deletions src/scripts/OSFramework/OSUI/Pattern/TimePicker/scss/_timepicker.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
/// Import Flatpickr library styles
@import '../../../../../Providers/OSUI/Timepicker/Flatpickr/scss/_flatpickr.scss';

@import 'timepicker_ss_preview_imgs';

///
.osui-timepicker {
input {
Expand Down Expand Up @@ -51,32 +49,39 @@

// Service Studio Preview
& {
-servicestudio-background-color: get-background-color('transparent');
-servicestudio-background-position: top left;
-servicestudio-background-repeat: no-repeat;
-servicestudio-background-size: contain;
-servicestudio-background-color: var(--color-neutral-0);
-servicestudio-border-radius: var(--border-radius-soft);
-servicestudio-display: inline-block;
-servicestudio-height: 0;
-servicestudio-display: flex;
-servicestudio-justify-content: space-evenly;
-servicestudio-line-height: var(--space-xl);
-servicestudio-margin-top: 2px;
-servicestudio-max-width: 320px;
-servicestudio-overflow: hidden;
-servicestudio-position: relative;
-servicestudio-width: 100%;
-servicestudio-text-align: center;
-servicestudio-z-index: var(--layer-local-tier-1);

&.time12h {
-servicestudio-background-image: $timepicker_time12h_img_base64;
-servicestudio-height: var(--space-xl);
}
&.time12h{
padding-right: var(--space-xxl);
&:after{
background-color: var(--color-neutral-7);
border-radius: var(--border-radius-rounded);
color: var(--color-neutral-0);
content:"am";
font-size: var(--font-size-xs);
font-weight: var(--font-semi-bold);
height: var(--space-m);
line-height: var(--space-m);
position: absolute;
right: var(--space-s);
top: 50%;
transform: translateY(-50%);
width: var(--space-xl);
text-transform: uppercase;
}

&.time24h {
-servicestudio-background-image: $timepicker_time24h_img_base64;
-servicestudio-height: var(--space-xl);
}

& + .placeholder-ss-preview {
-servicestudio-height: 0;
-servicestudio-opacity: 0;
-servicestudio-overflow: hidden;
-servicestudio-width: 100%;
Expand All @@ -102,18 +107,6 @@
}
}

// If Hybrid IDE
///
html[data-uieditorversion^='1'] {
.osui-timepicker__dropdown-ss-preview {
&.time12h,
&.time24h {
-servicestudio-padding-top: min(var(--space-xl), 100%);
-servicestudio-height: 0;
}
}
}

.osui-timepicker__dropdown {
&.hasTime.noCalendar {
.flatpickr-time {
Expand Down
6 changes: 0 additions & 6 deletions src/scripts/OSFramework/OSUI/Pattern/TimePicker/scss/_timepicker_ss_preview_imgs.scss
View file
Open in desktop

This file was deleted.

7 changes: 7 additions & 0 deletions src/scss/01-foundations/_icon-library-o11.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,13 @@
}
}

.osui-datepicker-calendar-ss-preview,
.osui-monthpicker-ss-preview {
--osui-icon-font-family: 'FontAwesome';
--osui-icon-arrow-left: '\f104';
--osui-icon-arrow-right: '\f105';
}

// DropdownServerSide
.osui-dropdown-serverside {
&__balloon {
Expand Down
Loading