Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query

This commit is contained in:
Harrys
2019-03-08 11:04:37 +04:00
4 changed files with 940 additions and 178 deletions

View File

@@ -66,7 +66,7 @@
"normalize-css": "^2.1.0", "normalize-css": "^2.1.0",
"npm": "^6.0.0", "npm": "^6.0.0",
"npm-modernizr": "^2.8.3", "npm-modernizr": "^2.8.3",
"phraseanet-production-client": "^0.33.0", "phraseanet-production-client": "0.33.84",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@@ -17,7 +17,7 @@
<div class="PNB10 LeftColumn"> <div class="PNB10 LeftColumn">
<div class="PNB" style="text-align:center;"> <div class="PNB" style="text-align:center;">
{% if context == 'Push' %} {% if context == 'Push' %}
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/push64.png"/> <img style="width: 36px; height: 36px" src="/assets/common/images/icons/push-icon.png"/>
{% else %} {% else %}
<img style="width: 36px; height: 36px" src="/assets/common/images/icons/validation.png"/> <img style="width: 36px; height: 36px" src="/assets/common/images/icons/validation.png"/>
{% endif %} {% endif %}

1114
yarn.lock

File diff suppressed because it is too large Load Diff