From 1a7cae27e0618461f94e1e768296d7496c9d47d1 Mon Sep 17 00:00:00 2001 From: Maksym Tsymbarov Date: Tue, 17 Feb 2026 12:48:22 +0200 Subject: [PATCH] Fix merge errors --- .../@iplab+ngx-color-picker+18.0.1.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 ui-ngx/patches/@iplab+ngx-color-picker+18.0.1.patch diff --git a/ui-ngx/patches/@iplab+ngx-color-picker+18.0.1.patch b/ui-ngx/patches/@iplab+ngx-color-picker+18.0.1.patch deleted file mode 100644 index 64fe082fb8..0000000000 --- a/ui-ngx/patches/@iplab+ngx-color-picker+18.0.1.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs b/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs -index 6c7f8b1..f390b3b 100644 ---- a/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs -+++ b/node_modules/@iplab/ngx-color-picker/esm2022/lib/helpers/color.class.mjs -@@ -173,7 +173,7 @@ export class Color { - const s = (color.saturation / 100) * (l <= 1 ? l : 2 - l); - const value = (l + s) / 2; - const saturation = (2 * s) / (l + s) || 0; -- return new Hsva(hue, saturation, value, color.alpha); -+ return new Hsva(hue, saturation * 100, value * 100, color.alpha); - } - rgbaToHsva(color) { - const red = color.red / 255; -diff --git a/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs b/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs -index a3b270c..9a9b592 100644 ---- a/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs -+++ b/node_modules/@iplab/ngx-color-picker/fesm2022/iplab-ngx-color-picker.mjs -@@ -505,7 +505,7 @@ class Color { - const s = (color.saturation / 100) * (l <= 1 ? l : 2 - l); - const value = (l + s) / 2; - const saturation = (2 * s) / (l + s) || 0; -- return new Hsva(hue, saturation, value, color.alpha); -+ return new Hsva(hue, saturation * 100, value * 100, color.alpha); - } - rgbaToHsva(color) { - const red = color.red / 255;