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 remote-tracking branch 'origin/develop' into feature/b931

Browse Source 
# Conflicts:
#	.idea/inspectionProfiles/Combodo.xml
#	application/cmdbabstract.class.inc.php
#	core/attributedef.class.inc.php
#	css/light-grey.css
#	css/light-grey.scss
This commit is contained in:
Eric
2018-09-25 12:03:44 +02:00
parent 16476f736a 534f6b6a54
commit a94211d3d3
33 changed files with 1404 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1010,7 +1010,7 @@ table .group-actions {
}
.caselog_field_entry_header {
padding: 6px;
font-size: 1em;
font-size: 0.9em;
border-bottom: 1px solid #fff;
background-color: #f2f2f2;
}

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

@@ -1087,7 +1087,7 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{
}
.caselog_field_entry_header{
padding: 6px;
font-size: 1em;
font-size: 0.9em;
border-bottom: 1px solid $white;
background-color: #F2F2F2;
}