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

Merge branch '3.8'

Browse Source 
Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
This commit is contained in:
Nicolas Le Goff
2014-02-05 15:25:52 +01:00
parent 04bb823a8b e9f1a2a257
commit 3b9b5a3240
7 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/skins/prod/000000/prodcolor.css
View File

@@ -3927,9 +3927,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
height: 100%;
}
#uploadBox #tab-upload,
#uploadBox #tab-lazaret {
height: 90%;
#uploadBox .ui-tabs .ui-tabs-panel {
padding: 20px;
}

3
www/skins/prod/959595/prodcolor.css
View File

@@ -4051,8 +4051,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
height: 100%;
}
#uploadBox #tab-upload,
#uploadBox #tab-lazaret {
#uploadBox .ui-tabs .ui-tabs-panel {
height: 90%;
padding: 20px;
}