composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 07:12:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°8274 - Fix input followed by input control (such as date time picker) display

Browse Source
This commit is contained in:
Stephen Abello
2025-04-02 15:48:42 +02:00
parent 994b08f94a
commit eff6fcff49
2 changed files with 29 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
datamodels/2.x/itop-portal-base/portal/public/css/components/_input.scss
View File

@@ -1,13 +1,22 @@
$ipb-form-control--color: $common-color-grey-800 !default; $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--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--border-color: $common-color-primary-700 !default;
$ipb-form-control--is-focused--box-shadow: none !default; $ipb-form-control--is-focused--box-shadow: none !default;
.form-control { .form-control {
color: $ipb-form-control--color; 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; -webkit-box-shadow: $ipb-form-control--box-shadow;
box-shadow: $ipb-form-control--box-shadow; box-shadow: $ipb-form-control--box-shadow;
&:focus { &:focus {
@@ -16,3 +25,21 @@ $ipb-form-control--is-focused--box-shadow: none !default;
-webkit-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;
}

7
datamodels/2.x/itop-portal-base/portal/public/css/themes/components/_input.scss
View File

@@ -1,7 +0,0 @@
/* SCSS variables */
$form-control--border-radius: $common-border-radius-300 !default;
.form-control {
border-radius: $form-control--border-radius!important;
}