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/classes/task/Scheduler.php
	lib/classes/task/abstract.php
	templates/web/client/index.html.twig
This commit is contained in:
Nicolas Le Goff
2014-02-04 11:25:59 +01:00
parent 095c9eb72f 2c42f7e3dc
commit 8f9745d874
15 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
www/include/jquery.contextmenu.images/cmenu-gloss-cyan-menu-item-hover.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-gloss-cyan-menu-item-hover.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 B

After

Width:  |  Height:  |  Size: 52 B

0
www/include/jquery.contextmenu.images/cmenu-gloss-menu-item-hover.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-gloss-menu-item-hover.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 52 B

After

Width:  |  Height:  |  Size: 52 B

0
www/include/jquery.contextmenu.images/cmenu-gloss-semitransparent-menu-item-hover.png → www/include/jslibs/jquery.contextmenu.images/cmenu-gloss-semitransparent-menu-item-hover.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
www/include/jquery.contextmenu.images/cmenu-human-menu-item-hover.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-human-menu-item-hover.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

0
www/include/jquery.contextmenu.images/cmenu-osx-menu-item-hover.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-osx-menu-item-hover.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 87 B

After

Width:  |  Height:  |  Size: 87 B

0
www/include/jquery.contextmenu.images/cmenu-vista-bg.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-vista-bg.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 B

After

Width:  |  Height:  |  Size: 64 B

0
www/include/jquery.contextmenu.images/cmenu-vista-menu-item-hover.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-vista-menu-item-hover.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 347 B

After

Width:  |  Height:  |  Size: 347 B

0
www/include/jquery.contextmenu.images/cmenu-xp-bg.gif → www/include/jslibs/jquery.contextmenu.images/cmenu-xp-bg.gif
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 223 B

After

Width:  |  Height:  |  Size: 223 B

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

@@ -1137,7 +1137,7 @@ form.phrasea_query input.query {
}
.history-validate, .history-push {
background-image: url('icons/push16.png');
background-image: url('/skins/icons/push16.png');
background-repeat: no-repeat;
background-position: center left;
padding-left: 30px;

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

@@ -1166,7 +1166,7 @@ form.phrasea_query input.query {
}
.history-validate, .history-push {
background-image: url('icons/push16.png');
background-image: url('/skins/icons/push16.png');
background-repeat: no-repeat;
background-position: center left;
padding-left: 30px;
@@ -1611,7 +1611,7 @@ input.btn-mini {
padding: 0 35px;
bottom: -10px;
position: absolute;
background-image: url('images/hsplitter.png');
background-image: url('../../icons/hsplitter.png');
background-position: center center;
background-repeat: no-repeat;
cursor: row-resize;