ZwiiCMS-Team/ZwiiCMS
ZwiiCMS-Team/ZwiiCMS
10
9
Fork 3
Code Releases 154 Activity

Thème admin fontes available non chargée.

Browse Source
This commit is contained in:
Fred Tempez 2022-04-17 14:45:44 +02:00
parent 06358f6616
commit 8ad2d12c45
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/core.php
View File

@ -2308,7 +2308,6 @@ class core extends common {
/** /**
* Charge les fontes websafe * Charge les fontes websafe
*/ */
$fontFile = '';
foreach ($fonts as $fontId) { foreach ($fonts as $fontId) {
if ( isset($fontsAvailable['websafe'][$fontId])) { if ( isset($fontsAvailable['websafe'][$fontId])) {
$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family']; $fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
@ -2328,7 +2327,7 @@ class core extends common {
$gf = strpos($fontsAvailable['imported'][$fontId]['resource'], 'fonts.googleapis.com') === false ? $gf || false : $gf || true; $gf = strpos($fontsAvailable['imported'][$fontId]['resource'], 'fonts.googleapis.com') === false ? $gf || false : $gf || true;
} }
} }
// Ajoute le préconnect des fontes Googles. // Ajoute le préconnect des fontes Google.
$fontFile = $gf ? '<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>' . $fontFile $fontFile = $gf ? '<link rel="preconnect" href="https://fonts.googleapis.com"><link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>' . $fontFile
: $fontFile; : $fontFile;
// Enregistre la personnalisation // Enregistre la personnalisation
@ -2544,6 +2543,11 @@ class core extends common {
// Version // Version
$css = '/*' . md5(json_encode($this->getData(['admin']))) . '*/'; $css = '/*' . md5(json_encode($this->getData(['admin']))) . '*/';
// Fonts disponibles
$fontsAvailable ['files'] = $this->getData(['fonts', 'files']);
$fontsAvailable ['imported'] = $this->getData(['fonts', 'imported']);
$fontsAvailable ['websafe'] = self::$fontsWebSafe;
/** /**
* Import des polices de caractères * Import des polices de caractères
* A partir du CDN ou dans le dossier site/file/source/fonts * A partir du CDN ou dans le dossier site/file/source/fonts
@ -2557,7 +2561,6 @@ class core extends common {
/** /**
* Charge les fontes websafe * Charge les fontes websafe
*/ */
$fontFile = '';
foreach ($fonts as $fontId) { foreach ($fonts as $fontId) {
if ( isset($fontsAvailable['websafe'][$fontId])) { if ( isset($fontsAvailable['websafe'][$fontId])) {
$fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family']; $fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family'];
@ -2598,6 +2601,8 @@ class core extends common {
} }
} }
// Thème Administration // Thème Administration
$colors = helper::colorVariants($this->getData(['admin','backgroundColor'])); $colors = helper::colorVariants($this->getData(['admin','backgroundColor']));
$css .= '#site{background-color:' . $colors['normal']. ';}'; $css .= '#site{background-color:' . $colors['normal']. ';}';