From 9ce66796b64c9ad188f680a6c6c736ba972402e2 Mon Sep 17 00:00:00 2001 From: BenOsodrac Date: Wed, 25 Feb 2026 13:48:46 +0000 Subject: [PATCH] add fontAwesome as fallback --- .../ServerSide/scss/_dropdown-serverside.scss | 2 - .../OutSystems/OSUI/Utils/IconLibrary.ts | 2 +- .../01-foundations/_icon-library-o11.scss | 9 ++ .../01-foundations/_icon-library-odc.scss | 82 +++++++++---------- 4 files changed, 51 insertions(+), 44 deletions(-) diff --git a/src/scripts/OSFramework/OSUI/Pattern/Dropdown/ServerSide/scss/_dropdown-serverside.scss b/src/scripts/OSFramework/OSUI/Pattern/Dropdown/ServerSide/scss/_dropdown-serverside.scss index f066841bf9..418671b99d 100644 --- a/src/scripts/OSFramework/OSUI/Pattern/Dropdown/ServerSide/scss/_dropdown-serverside.scss +++ b/src/scripts/OSFramework/OSUI/Pattern/Dropdown/ServerSide/scss/_dropdown-serverside.scss @@ -55,9 +55,7 @@ $balloonMobileTopMargin: 5vh; &:after { align-items: center; color: get-text-color('neutral-7'); - content: '\f107'; display: flex; - font: normal normal normal 20px/1 FontAwesome; height: 100%; pointer-events: none; position: absolute; diff --git a/src/scripts/OutSystems/OSUI/Utils/IconLibrary.ts b/src/scripts/OutSystems/OSUI/Utils/IconLibrary.ts index c0d0dd878d..686cda8dfc 100644 --- a/src/scripts/OutSystems/OSUI/Utils/IconLibrary.ts +++ b/src/scripts/OutSystems/OSUI/Utils/IconLibrary.ts @@ -35,7 +35,7 @@ namespace OutSystems.OSUI.Utils.IconLibrary { const newIconLibrary = iconLibrary.replace(/[\d.]/g, ''); // Normalizes name (strips digits/dots) const currentIconLibrary = IconLibrary.GetIconLibrary(); - if (currentIconLibrary === newIconLibrary) { + if (currentIconLibrary === newIconLibrary || newIconLibrary === '') { return; } diff --git a/src/scss/01-foundations/_icon-library-o11.scss b/src/scss/01-foundations/_icon-library-o11.scss index a295a6f2fb..a6e6c85d66 100644 --- a/src/scss/01-foundations/_icon-library-o11.scss +++ b/src/scss/01-foundations/_icon-library-o11.scss @@ -234,6 +234,15 @@ } } +.osui-dropdown-serverside { + &__selected-values { + &:after { + content: '\f107'; + font: normal normal normal 20px/1 FontAwesome; + } + } +} + // DropdownSearch (VirtualSelect) // VirtualSelect overriding styles // Parent wrapper container diff --git a/src/scss/01-foundations/_icon-library-odc.scss b/src/scss/01-foundations/_icon-library-odc.scss index 625c437a85..19e455510e 100644 --- a/src/scss/01-foundations/_icon-library-odc.scss +++ b/src/scss/01-foundations/_icon-library-odc.scss @@ -4,90 +4,90 @@ /// When :root has .icon-library-Phosphor or .icon-library-FontAwesome, icons use the matching font. /// +/// // --------------------------------------------------------------------------- +// FontAwesome icon library (default fallback) // --------------------------------------------------------------------------- -// Phosphor icon library -// --------------------------------------------------------------------------- -:root.icon-library-Phosphor { - --osui-icon-font-family: 'Phosphor'; +:root { + --osui-icon-font-family: 'FontAwesome'; // Dropdown / caret (angle-down) - --osui-icon-arrow-down: '\e136'; + --osui-icon-arrow-down: '\f107'; // Caret up (TimePicker) - --osui-icon-arrow-up: '\e13c'; + --osui-icon-arrow-up: '\f106'; // Search - --osui-icon-search: '\e30c'; + --osui-icon-search: '\f002'; - // Clear / close (times, X) - --osui-icon-clear: '\e4f6'; + // Clear / close (times) + --osui-icon-clear: '\f00d'; // Chevrons - --osui-icon-chevron-right: '\e13a'; - --osui-icon-chevron-left: '\e138'; + --osui-icon-chevron-right: '\f054'; + --osui-icon-chevron-left: '\f053'; // Checkbox check - --osui-icon-check: '\e182'; + --osui-icon-check: '\f00c'; // Alert - --osui-icon-info: '\e2ce'; - --osui-icon-success: '\e184'; - --osui-icon-error: '\e4f8'; - --osui-icon-warning: '\e4e0'; + --osui-icon-info: '\f05a'; + --osui-icon-success: '\f058'; + --osui-icon-error: '\f057'; + --osui-icon-warning: '\f071'; // ChatMessage - --osui-icon-sent: '\e182'; - --osui-icon-time: '\e19a'; + --osui-icon-sent: '\f00c'; + --osui-icon-time: '\f017'; // Checkbox - --osui-icon-checkbox-checked: '\e182'; + --osui-icon-checkbox-checked: '\f00c'; // Lightbox - --osui-icon-arrow-next: '\e06c'; - --osui-icon-arrow-previous: '\e058'; + --osui-icon-arrow-next: '\f061'; + --osui-icon-arrow-previous: '\f060'; } // --------------------------------------------------------------------------- -// FontAwesome icon library +// Phosphor icon library // --------------------------------------------------------------------------- -:root.icon-library-FontAwesome { - --osui-icon-font-family: 'FontAwesome'; +:root.icon-library-Phosphor { + --osui-icon-font-family: 'Phosphor'; // Dropdown / caret (angle-down) - --osui-icon-arrow-down: '\f107'; + --osui-icon-arrow-down: '\e136'; // Caret up (TimePicker) - --osui-icon-arrow-up: '\f106'; + --osui-icon-arrow-up: '\e13c'; // Search - --osui-icon-search: '\f002'; + --osui-icon-search: '\e30c'; - // Clear / close (times) - --osui-icon-clear: '\f00d'; + // Clear / close (times, X) + --osui-icon-clear: '\e4f6'; // Chevrons - --osui-icon-chevron-right: '\f054'; - --osui-icon-chevron-left: '\f053'; + --osui-icon-chevron-right: '\e13a'; + --osui-icon-chevron-left: '\e138'; // Checkbox check - --osui-icon-check: '\f00c'; + --osui-icon-check: '\e182'; // Alert - --osui-icon-info: '\f05a'; - --osui-icon-success: '\f058'; - --osui-icon-error: '\f057'; - --osui-icon-warning: '\f071'; + --osui-icon-info: '\e2ce'; + --osui-icon-success: '\e184'; + --osui-icon-error: '\e4f8'; + --osui-icon-warning: '\e4e0'; // ChatMessage - --osui-icon-sent: '\f00c'; - --osui-icon-time: '\f017'; + --osui-icon-sent: '\e182'; + --osui-icon-time: '\e19a'; // Checkbox - --osui-icon-checkbox-checked: '\f00c'; + --osui-icon-checkbox-checked: '\e182'; // Lightbox - --osui-icon-arrow-next: '\f061'; - --osui-icon-arrow-previous: '\f060'; + --osui-icon-arrow-next: '\e06c'; + --osui-icon-arrow-previous: '\e058'; } // ---------------------------------------------------------------------------