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/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Admin/Users.php
	lib/Alchemy/Phrasea/Controller/Lightbox.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/TOU.php
	lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Security/Firewall.php
	lib/classes/task/abstract.php
	tests/Alchemy/Tests/Phrasea/Security/FirewallTest.php
This commit is contained in:
Nicolas Le Goff
2014-02-05 19:42:22 +01:00
parent 280e8b6178 863975d7ca
commit c4eadb7e0e
52 changed files with 133 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css vendored
View File

@@ -801,7 +801,7 @@ body .ui-tooltip {
}
.ui-widget-content {
border: 1px solid #202020;
background: #555555 url(images/ui-bg_flat_75_555555_40x100.png) 50% 50% repeat-x;
background: #555555 url(images/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x;
color: #ff9000;
}
.ui-widget-content a {
@@ -809,7 +809,7 @@ body .ui-tooltip {
}
.ui-widget-header {
border: 1px solid #202020;
background: #202020 url(images/ui-bg_flat_75_202020_40x100.png) 50% 50% repeat-x;
background: #202020 url(images/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x;
color: #222222;
font-weight: bold;
}

2
www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.min.css vendored
View File

File diff suppressed because one or more lines are too long