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

Merge branch 'support/3.2' into develop

Browse Source 
# Conflicts:
#	css/setup.css
#	datamodels/2.x/itop-portal-base/portal/public/css/portal.css
#	package-lock.json
This commit is contained in:
Stephen Abello
2026-04-29 16:58:50 +02:00
parent ea35ad48d2 de4ec9d9ce
commit 8de5c2525b
179 changed files with 7748 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
datamodels/2.x/itop-portal-base/portal/public/css/bootstrap-theme-combodo.css vendored
View File

File diff suppressed because one or more lines are too long

2
datamodels/2.x/itop-portal-base/portal/public/css/main.css
View File

File diff suppressed because one or more lines are too long

10
datamodels/2.x/itop-portal-base/portal/public/css/portal.css
View File

File diff suppressed because one or more lines are too long

12
datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
View File

@@ -18,7 +18,6 @@
@import 'common/main.scss';
@import 'variables.scss';
@import "utils/all";
@import '../node_modules/ckeditor5-itop-build/build/styles/compiled-theme';
/*!
* Combodo portal template v1.0.0
@@ -541,9 +540,14 @@ table .group-actions a.glyphicon-menu-hamburger{
/*********/
/* Forms */
/*********/
/* - Ensure HTML contents are displayed like in CKEditor */
.ipb-is-html-content {
@extend .ck-content;
:root {
--ck-content-font-family: inherit;
--ck-content-font-color: inherit;
--ck-content-font-size: inherit;
--ck-content-line-height: inherit;
--ck-content-word-break: inherit;
--ck-content-overflow-wrap: inherit;
}

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

@@ -18,6 +18,9 @@ $ipb-field--is-mandatory--color: $ipb-color-primary-700 !default;
$ipb-form--linkedset--toggler--color: $ipb-color-primary-700 !default;
$ipb-field--label--color: $ipb-color-grey-900 !default;
$ipb-field--value--color: $ipb-color-grey-900 !default;
.form_fields {
fieldset {
background-color: $ipb--fieldset--background-color;
@@ -42,4 +45,12 @@ $ipb-form--linkedset--toggler--color: $ipb-color-primary-700 !default;
& > .glyphicon{
color: $ipb-form--linkedset--toggler--color;
}
}
.form_field_label {
color: $ipb-field--label--color;
}
.form_field_control, .form_field_control .ipb-is-html-content {
color: $ipb-field--value--color;
}

3
datamodels/2.x/itop-portal-base/portal/public/css/themes/vendors/_all.scss vendored
View File

@@ -1 +1,2 @@
@import "datatables";
@import "datatables";
@import "ckeditor";

20
datamodels/2.x/itop-portal-base/portal/public/css/themes/vendors/_ckeditor.scss vendored Normal file
View File

@@ -0,0 +1,20 @@
@import '../node_modules/ckeditor5-itop-build/build/styles/compiled-theme';
$ipb-vendors-ckeditor--ck-content--text-color: $ipb-color-grey-900 !default;
:root {
--ck-content-font-family: inherit;
--ck-content-font-color: inherit;
--ck-content-font-size: inherit;
--ck-content-line-height: inherit;
--ck-content-word-break: inherit;
--ck-content-overflow-wrap: inherit;
}
.ck-content {
color: $ipb-vendors-ckeditor--ck-content--text-color;
}
.ipb-is-html-content {
@extend .ck-content;
}