hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Admin/Root.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	lib/classes/task/databoxAbstract.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/email-template.html.twig
This commit is contained in:
Nicolas Le Goff
2014-01-24 18:52:14 +01:00
parent c0919fbdc9 d61917707a
commit 6ba5ce6669
9 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/skins/admin/css/Main.css
View File

@@ -283,3 +283,12 @@ div.switch_right.unchecked {
margin: 10px 0;
line-height: 22px;
}
#tab_demandes .dl-horizontal dd {
word-break: break-all;
margin-left: 140px;
}
#tab_demandes .dl-horizontal dt {
width: 130px;
}