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 'master-alchemy' into PHRAS-1735_add_git_log

Browse Source 
# Conflicts:
#	resources/www/common/js/components/common.js
This commit is contained in:
Mike Ng
2018-01-08 16:26:28 +04:00
parent 8908a6b23f
commit 3dd4c50350
27 changed files with 564 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/web/common/menubar.html.twig
View File

@@ -137,7 +137,8 @@
<a target="_blank" href="https://docs.phraseanet.com/4.0/">
<span>
{{ 'phraseanet:: aide' | trans }}
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;" id="help-trigger"> <i class="icon-caret-down"></i></span>
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
id="help-trigger"> <i class="icon-caret-down"></i></span>
</span>
</a>
<table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">