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

N°3929 Fix dashboard properties buttons and change semantics colors/icons

Browse Source
This commit is contained in:
Stephen Abello
2021-09-08 11:15:22 +02:00
parent e29ae488a1
commit d1c39c5e10
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/forms.class.inc.php
View File

@@ -229,8 +229,8 @@ class DesignerForm
$aRow = $oField->Render($oP, $sFormId, 'property');
if ($oField->IsVisible()) {
$sFieldId = $this->GetFieldId($oField->GetCode());
$sValidation = $this->GetValidationArea($sFieldId, '<span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Apply').'"><i class="fas fa-check"></i></span>');
$sValidationFields = '</td><td class="prop_icon prop_apply ibo-prop--apply ibo-button ibo-is-alternative" >'.$sValidation.'</td><td class="prop_icon prop_cancel ibo-prop--cancel ibo-button ibo-is-alternative"><span data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-times"></i></span></td>'
$sValidation = $this->GetValidationArea($sFieldId, '<div class="ibo-button ibo-is-alternative ibo-is-success" data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Apply').'"><i class="fas fa-check"></i></div>');
$sValidationFields = '</td><td class="prop_icon prop_apply ibo-prop--apply" >'.$sValidation.'</td><td class="prop_icon prop_cancel ibo-prop--cancel"><span><div class="ibo-button ibo-is-alternative ibo-is-neutral" data-tooltip-content="'.Dict::Format('UI:DashboardEdit:Revert').'"><i class="fas fa-undo"></i></div></span></td>'
.$this->EndRow();
if (is_null($aRow['label'])) {

10
css/backoffice/components/_prop.scss
View File

@@ -13,9 +13,6 @@ $ibo-prop--apply--error--color: $ibo-color-grey-800 !default;
.ibo-prop--apply{
width: $ibo-prop--apply--width;
padding-left: $ibo-prop--apply--padding-left;
> span{
@extend .ibo-is-green;
}
&.ui-state-error{
&:after {
color: $ibo-prop--apply--error--color;
@@ -31,9 +28,6 @@ $ibo-prop--apply--error--color: $ibo-color-grey-800 !default;
.ibo-prop--cancel{
width: $ibo-prop--cancel--width;
padding-left: $ibo-prop--cancel--padding-left;
> span{
@extend .ibo-is-red;
}
}
.ibo-prop--apply, .ibo-prop--cancel{
height: $ibo-prop--apply-cancel--height;
@@ -42,5 +36,9 @@ $ibo-prop--apply--error--color: $ibo-color-grey-800 !default;
height: $ibo-prop--apply-cancel--span--height;
width: $ibo-prop--apply-cancel--span--width;
text-align: center;
> div{
width: 100%;
height: 100%;
}
}
}