Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion css/backoffice/components/_quick-create.scss
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ $ibo-quick-create--compartment--placeholder-hint--text-color: $ibo-color-grey-70

&:hover {
cursor: pointer;
@extend a;
color: $ibo-hyperlink-color--on-hover;
text-decoration: $ibo-hyperlink-text-decoration--on-hover;
}

.highlight {
Expand Down
1 change: 1 addition & 0 deletions css/backoffice/vendors/ckeditor/_overloads.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ $ibo-vendors-ckeditor--ck-mentions--item--padding-y: $ibo-spacing-200 !default;
--ck-text-small-font-size: #{$ibo-vendors-ckeditor--ck-text-small-font-size};
--ck-text-big-font-size: #{$ibo-vendors-ckeditor--ck-text-big-font-size};
--ck-text-huge-font-size: #{$ibo-vendors-ckeditor--ck-text-huge-font-size};
--ck-content-font-family: #{$ibo-font-family-base}, #{$ibo-font-family-fallbacks};

--ck-color-image-caption-text: #{$ibo-vendors-ckeditor--ck-color-image-caption-text};
}
Expand Down

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion datamodels/2.x/itop-portal-base/portal/public/css/main.css

Large diffs are not rendered by default.

8 changes: 0 additions & 8 deletions datamodels/2.x/itop-portal-base/portal/public/css/portal.css

Large diffs are not rendered by default.

6 changes: 0 additions & 6 deletions datamodels/2.x/itop-portal-base/portal/public/css/portal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -541,11 +540,6 @@ table .group-actions a.glyphicon-menu-hamburger{
/*********/
/* Forms */
/*********/
/* - Ensure HTML contents are displayed like in CKEditor */
.ipb-is-html-content {
@extend .ck-content;
}


/* Note: We don't put the .form_field selector as it must work for read-only */
.form-control-static img{
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
@import "datatables";
@import "datatables";
@import "ckeditor";
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
@import '../node_modules/ckeditor5-itop-build/build/styles/compiled-theme';

:root {
--ck-content-font-family: #{$common-font-family-base}, #{$common-font-family-fallbacks};
}

.ipb-is-html-content {
@extend .ck-content;
}
5 changes: 4 additions & 1 deletion js/ckeditor.handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,10 @@ const CombodoCKEditorHandler = {
this.is_upload_configured[sElem] = false;
// create instance
return this.instances_promise[sElem] = new Promise((resolve, reject) => {
ClassicEditor.create($(sElem)[0], aConfiguration)
ClassicEditor.create(Object.assign({
attachTo: $(sElem)[0],
licenseKey: 'GPL',
}, aConfiguration))
.then(editor => {
// Adjust size if passed in configuration
// - Width
Expand Down
8 changes: 4 additions & 4 deletions lib/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -1672,12 +1672,12 @@
"source": {
"type": "git",
"url": "https://github.com/combodo-itop-libs/scssphp.git",
"reference": "dde81c0a39d02e8e6fc81b70269747734e16d526"
"reference": "6820f035182a956c355cbfa7882d90f1198a208b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/dde81c0a39d02e8e6fc81b70269747734e16d526",
"reference": "dde81c0a39d02e8e6fc81b70269747734e16d526",
"url": "https://api.github.com/repos/combodo-itop-libs/scssphp/zipball/6820f035182a956c355cbfa7882d90f1198a208b",
"reference": "6820f035182a956c355cbfa7882d90f1198a208b",
"shasum": ""
},
"require": {
Expand All @@ -1700,7 +1700,7 @@
"ext-iconv": "Can be used as fallback when ext-mbstring is not available",
"ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
},
"time": "2026-03-23T15:26:59+00:00",
"time": "2026-04-23T14:20:24+00:00",
"bin": [
"bin/pscss"
],
Expand Down
14 changes: 7 additions & 7 deletions lib/composer/installed.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?php return array(
'root' => array(
'name' => 'combodo/itop',
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '3ccbfb2b130419fec9d1158836395a13baa0ec4b',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => null,
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand All @@ -22,9 +22,9 @@
'dev_requirement' => false,
),
'combodo/itop' => array(
'pretty_version' => 'dev-develop',
'version' => 'dev-develop',
'reference' => '3ccbfb2b130419fec9d1158836395a13baa0ec4b',
'pretty_version' => '1.0.0+no-version-set',
'version' => '1.0.0.0',
'reference' => null,
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
Expand Down Expand Up @@ -296,7 +296,7 @@
'scssphp/scssphp' => array(
'pretty_version' => 'dev-combodo/1.x',
'version' => 'dev-combodo/1.x',
'reference' => 'dde81c0a39d02e8e6fc81b70269747734e16d526',
'reference' => '6820f035182a956c355cbfa7882d90f1198a208b',
'type' => 'library',
'install_path' => __DIR__ . '/../scssphp/scssphp',
'aliases' => array(),
Expand Down
18 changes: 17 additions & 1 deletion lib/scssphp/scssphp/src/Compiler.php
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ protected function matchExtends($selector, &$out, $from = 0, $initial = true)
// if the new part is just including a previous part don't try to extend anymore
if (\count($part) > 1) {
foreach ($partsPile as $previousPart) {
if (! \count(array_diff($previousPart, $part))) {
if (! \count($this->diff_recursive($previousPart, $part))) {
continue 2;
}
}
Expand Down Expand Up @@ -10511,4 +10511,20 @@ protected function libScssphpGlob($args)

return [Type::T_LIST, ',', $listParts];
}

protected function diff_recursive($array1, $array2) {
$difference=array();
foreach($array1 as $key => $value) {
if(is_array($value) && isset($array2[$key])){ // it's an array and both have the key
$new_diff = $this->diff_recursive($value, $array2[$key]);
if( !empty($new_diff) )
$difference[$key] = $new_diff;
} else if(is_string($value) && !in_array($value, $array2)) { // the value is a string and it's not in array B
$difference[$key] = $value . " is missing from the second array";
} else if(!is_numeric($key) && !array_key_exists($key, $array2)) { // the key is not numberic and is missing from array B
$difference[$key] = "Missing from the second array";
}
}
return $difference;
}
}
4 changes: 2 additions & 2 deletions node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion node_modules/ckeditor5-itop-build/build/ckeditor.d.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading