composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/itop-carbon' into develop

Browse Source 
# Conflicts:
#	application/utils.inc.php
#	setup/ajax.dataloader.php
This commit is contained in:
Pierre Goiffon
2019-10-22 18:27:13 +02:00
parent 52fd58cd93 b0414748cb
commit c8b791efd3
6 changed files with 204 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
css/light-grey.css
View File

@@ -2411,6 +2411,12 @@ a.summary, a.summary:hover {
background: url(../images/ok.png?v=v2.7.0-dev) 1em 1em no-repeat #cfc;
padding-left: 3em;
}
.message_warning {
border: 1px solid #ec9800;
background: url(../images/error.png?v=v2.6.1) 1em 1em no-repeat #ffd78d;
color: #000;
padding-left: 3em;
}
.message_error {
border: 1px solid #933;
background: url(../images/error.png?v=v2.7.0-dev) 1em 1em no-repeat #fcc;
@@ -2943,6 +2949,17 @@ table.listResults .originColor {
.menu-icon-select > .ui-menu-item {
padding: 0.3em 3%;
}
.menu-icon-select > .ui-menu-item > * {
width: 100%;
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;
}
.menu-icon-select > .ui-menu-item > * > img {
max-width: 80px;
max-height: 45px;
margin-right: 10px;
}
.attribute.attribute-set .attribute-set-item::after {
content: ",";
margin-right: 0.5em;