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

PHRAS-3164 add favicon

Browse Source
This commit is contained in:
Harrys Ravalomanana
2020-07-07 14:53:21 +04:00
parent b407a854c1
commit 16a390fdb2
5 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -65,7 +65,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.34.250-d", "phraseanet-production-client": "0.34.252-d",
"requirejs": "^2.3.5", "requirejs": "^2.3.5",
"tinymce": "^4.0.28", "tinymce": "^4.0.28",
"underscore": "^1.8.3", "underscore": "^1.8.3",

18
resources/www/lightbox/styles/main.scss
View File

@@ -713,3 +713,21 @@ a.btn-info {
} }
/** End Lightbox summary modal**/ /** End Lightbox summary modal**/
.humane{
position: fixed;
z-index: 100000;
font-family: Ubuntu, Arial, sans-serif;
text-align: center;
font-size: 15px;
top: 100px;
right: 70px;
width: 400px;
background: #2d2d72;
color: rgb(255, 255, 255);
box-shadow: rgb(0, 0, 0) 0px 4px 4px -4px;
transform: translateY(-40px);
transition: all 0.3s ease-out 0s;
padding: 10px;
border-radius: 5px;
}

4
templates/web/lightbox/index.html.twig
View File

@@ -11,10 +11,6 @@
<link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox{% if not app.debug %}.min{% endif %}.css" media="screen"/> <link type="text/css" rel="stylesheet" href="/assets/lightbox/css/lightbox{% if not app.debug %}.min{% endif %}.css" media="screen"/>
{% endblock %} {% endblock %}
{% block icon %}
<link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
{% endblock %}
{% block content %} {% block content %}
<div id="main_index" style="margin-top:50px;"> <div id="main_index" style="margin-top:50px;">
<table id="main_wrapper" cellspacing="0" cellpadding="0"> <table id="main_wrapper" cellspacing="0" cellpadding="0">

3
templates/web/lightbox/index_layout.html.twig
View File

@@ -1,5 +1,8 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% block icon %}
<link rel="shortcut icon" type="image/x-icon" href="/assets/lightbox/images/favicon.ico">
{% endblock %}
{% block extra_content %} {% block extra_content %}
<div id="DIALOG"></div> <div id="DIALOG"></div>
{% endblock %} {% endblock %}

8
yarn.lock
View File

@@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d:
js-cookie "^2.1.0" js-cookie "^2.1.0"
pym.js "^1.3.1" pym.js "^1.3.1"
phraseanet-production-client@0.34.250-d: phraseanet-production-client@0.34.252-d:
version "0.34.250-d" version "0.34.252-d"
resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.250-d.tgz#6d885ed986b22733bdd8e76a1abb0ab85fe35635" resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.252-d.tgz#e3a628d08d825c2554220cfcbbda3f8e3c3c6127"
integrity sha512-ae9URsI+LfoRcEP8OD73KpOjJnLYRiqXtgzAzLF97oATY9fidd70lZQPRHgSGKCMLgvE4F68noEAjWoIWE7cpQ== integrity sha512-jSfa47v3TcwIbv6ItpzzXER/1U7ydrLyiUFRpJn+H0FapPUJCoKZ9Iy1PqNmUIzlTjqewQlatXSCLzMfzBcMlg==
dependencies: dependencies:
"@mapbox/mapbox-gl-language" "^0.9.2" "@mapbox/mapbox-gl-language" "^0.9.2"
"@turf/turf" "^5.1.6" "@turf/turf" "^5.1.6"