Merge branch 'master' into dist/envole/6/master

This commit is contained in:
Arnaud Fornerot 2021-03-08 10:50:49 +01:00
commit 4314cec399
13 changed files with 2 additions and 12 deletions

View File

@ -1,6 +1,5 @@
{% set logo = "icart.png" %}
{% set fgheader = "true" %}
{% set header = "header.jpg" %}
{% set heightheader = "" %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -1,5 +1,4 @@
{% macro logo() %}{{ app.session.get('logo') }}{% endmacro %}
{% macro fgheader() %}{{ app.session.get('fgheader') }}{% endmacro %}
{% macro header() %}{{ app.session.get('header') }}{% endmacro %}
{% macro heightheader() %}{{ app.session.get('heightheader') }}{% endmacro %}
{% macro colorR() %}{{ app.session.get('color')['mainrgb']['r'] }}{% endmacro %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -1,6 +1,5 @@
{% set logo = "logo.png" %}
{% set fgheader = "true" %}
{% set header = "" %}
{% set heightheader = "150" %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -1,6 +1,5 @@
{% set logo = "" %}
{% set fgheader = "" %}
{% set header = "" %}
{% set heightheader = "" %}

View File

@ -149,7 +149,7 @@
value: true
{% endif %}
},
success: function(idbookmark) {
success: function() {
location.reload();
}
});

View File

@ -187,6 +187,7 @@
.header .title,
.panel-heading,
.widgetheader,
#navbarsmalltitle,
h1 {
font-family: var(--fontfacetitle);
}

View File

@ -14,7 +14,6 @@
{% import '@Theme/constant.html.twig' as constant %}
{% set logo = constant.logo().__toString %}
{% set fgheader = constant.fgheader().__toString %}
{% set header = constant.header().__toString %}
{% set heightheader = constant.heightheader().__toString %}
{% set colorR = constant.colorR.__toString %}