Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-02-14 08:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source 
Conflicts:
	htdocs/filefunc.inc.php
This commit is contained in:
Laurent Destailleur
2017-02-23 02:55:50 +01:00
parent 7673aff3ba e981e719a1
commit fb88eaf2a4
38 changed files with 416 additions and 295 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/theme/md/style.css.php
View File

@@ -694,7 +694,9 @@ div.fiche>form>div.div-table-responsive {
text-overflow: ellipsis;
white-space: nowrap;
}
div.fiche {
margin-top: <?php print ($dol_hide_topmenu?'12':'6'); ?>px !important;
}
div.titre {
line-height: 2em;
}
@@ -758,6 +760,10 @@ div.fiche>form>div.div-table-responsive {
width: 20px;
object-fit: contain;
}
div.statusref {
padding-right: 10px;
}
}
.linkobject { cursor: pointer; }
<?php if (GETPOST("optioncss") == 'print') { ?>