From eff6fcff4975f56ac53a19ee06b429939c773407 Mon Sep 17 00:00:00 2001
From: Stephen Abello <stephen.abello@combodo.com>
Date: Wed, 2 Apr 2025 15:48:42 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B08274=20-=20Fix=20input=20followed=20by?=
 =?UTF-8?q?=20input=20control=20(such=20as=20date=20time=20picker)=20displ?=
 =?UTF-8?q?ay?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../portal/public/css/components/_input.scss  | 31 +++++++++++++++++--
 .../public/css/themes/components/_input.scss  |  7 -----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/components/_input.scss b/datamodels/2.x/itop-portal-base/portal/public/css/components/_input.scss
index 52389934c2..4b36eb17a2 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/css/components/_input.scss
+++ b/datamodels/2.x/itop-portal-base/portal/public/css/components/_input.scss
@@ -1,13 +1,22 @@
 $ipb-form-control--color: $common-color-grey-800 !default;
-$ipb-form-control--border-radius: $common-border-radius-500 !default;
+$ipb-form-control--border-radius: $common-border-radius-300 !default;
 $ipb-form-control--box-shadow: none !default;
+$ipb-form-control--input-group-addon--border-top-right-radius: 0 !default;
+$ipb-form-control--input-group-addon--border-bottom-right-radius: 0 !default;
+
+$ipb-input-group-addon--border: 1px solid $ipb-color-grey-300 !default;
+$ipb-input-group-addon--border-radius: $ipb-form-control--border-radius !default;
+$ipb-input-group-addon--background-color: $common-color-grey-100 !default;
+$ipb-input-group-addon--color: $common-color-grey-800 !default;
+$ipb-input-group-addon--form-control--border-top-left-radius: 0 !default;
+$ipb-input-group-addon--form-control--border-bottom-left-radius: 0 !default;
 
 $ipb-form-control--is-focused--border-color: $common-color-primary-700 !default;
 $ipb-form-control--is-focused--box-shadow: none !default;
 
 .form-control {
   color: $ipb-form-control--color;
-  border-radius: $common-border-radius-500 !important;
+  border-radius: $ipb-form-control--border-radius;
   -webkit-box-shadow: $ipb-form-control--box-shadow;
   box-shadow: $ipb-form-control--box-shadow;
   &:focus {
@@ -15,4 +24,22 @@ $ipb-form-control--is-focused--box-shadow: none !default;
     box-shadow: $ipb-form-control--is-focused--box-shadow;
     -webkit-box-shadow: $ipb-form-control--is-focused--box-shadow;
   }
+}
+
+.form-control:has(+ .input-group-addon) {
+  border-top-right-radius: $ipb-form-control--input-group-addon--border-top-right-radius;
+  border-bottom-right-radius: $ipb-form-control--input-group-addon--border-bottom-right-radius;
+}
+
+.input-group-addon {
+  border: $ipb-input-group-addon--border;
+  border-radius: $ipb-input-group-addon--border-radius;
+  background-color: $ipb-input-group-addon--background-color;
+  color: $ipb-input-group-addon--color;
+
+}
+
+.form-control + .input-group-addon {
+  border-top-left-radius: $ipb-input-group-addon--form-control--border-top-left-radius;
+  border-bottom-left-radius: $ipb-input-group-addon--form-control--border-bottom-left-radius;
 }
\ No newline at end of file
diff --git a/datamodels/2.x/itop-portal-base/portal/public/css/themes/components/_input.scss b/datamodels/2.x/itop-portal-base/portal/public/css/themes/components/_input.scss
index 166b82f530..e69de29bb2 100644
--- a/datamodels/2.x/itop-portal-base/portal/public/css/themes/components/_input.scss
+++ b/datamodels/2.x/itop-portal-base/portal/public/css/themes/components/_input.scss
@@ -1,7 +0,0 @@
-/* SCSS variables */
-$form-control--border-radius: $common-border-radius-300 !default;
-
-
-.form-control {
-  border-radius: $form-control--border-radius!important;
-}