composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 17:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/3.0' into develop

Browse Source
This commit is contained in:
Pierre Goiffon
2023-03-06 14:57:11 +01:00
parent 2ccd1a667d 03fb78c38c
commit 08a0c7ec88
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
datamodels/2.x/combodo-backoffice-darkmoon-theme/scss/ace_editor.scss
View File

@@ -22,10 +22,16 @@
color: $ibo-color-red-600 !important;
}
.ace-eclipse .ace_marker-layer .ace_active-line {
background: $ibo-color-grey-600 !important;
&:only-child {
background: $ibo-color-grey-600 !important;
}
&:not(:only-child) {
background: $ibo-color-grey-700 !important;
}
}
.ace-eclipse .ace_marker-layer .ace_selection {
background: $ibo-color-grey-600 !important;
background: $ibo-color-grey-500 !important;
}
.ace-eclipse.ace_multiselect .ace_selection.ace_start {
box-shadow: 0 0 3px 0px $ibo-color-grey-800 !important;

8
setup/setuppage.class.inc.php
View File

@@ -77,25 +77,25 @@ class SetupPage extends NiceWebPage
public function info($sText, $sTextForLog = null)
{
$this->add("<p class=\"info\">$sText</p>\n");
$this->add("<p class=\"info ibo-is-html-content\">$sText</p>\n");
SetupLog::Info($sTextForLog ?? $sText);
}
public function ok($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-valid\"><span class=\"message-title\">Success:</span>$sText</div>");
$this->add("<div class=\"message message-valid ibo-is-html-content\"><span class=\"message-title\">Success:</span>$sText</div>");
SetupLog::Ok($sTextForLog ?? $sText);
}
public function warning($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-warning\"><span class=\"message-title\">Warning:</span>$sText</div>");
$this->add("<div class=\"message message-warning ibo-is-html-content\"><span class=\"message-title\">Warning:</span>$sText</div>");
SetupLog::Warning($sTextForLog ?? $sText);
}
public function error($sText, $sTextForLog = null)
{
$this->add("<div class=\"message message-error\">$sText</div>");
$this->add("<div class=\"message message-error ibo-is-html-content\">$sText</div>");
SetupLog::Error($sTextForLog ?? $sText);
}