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/Core/Version.php
	lib/classes/task/period/archive.php
	templates/web/admin/collection/collection.html.twig
	templates/web/admin/databox/databox.html.twig
	templates/web/login/layout/base-layout.html.twig
This commit is contained in:
Romain Neutron
2013-12-09 14:17:03 +01:00
parent 5154fcac93 ef55bd29cc
commit 9580ff7585
7 changed files with 76 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/skins/login/less/skin.less
View File

@@ -878,7 +878,7 @@ form[name=registerForm] .multiselect-group {
#authentication-sidebar-language {
position: absolute;
top: 0;
left: 0;
left: 20px;
right: 20px;
}

2
www/skins/prod/Push.css
View File

@@ -258,7 +258,7 @@
.ui-autocomplete li.list-item {
width:280px;
height:45px;
min-height:45px;
display:block;
}