From 8ad2d12c45f861aa912aadb53179c887498ca752 Mon Sep 17 00:00:00 2001 From: fredtempez Date: Sun, 17 Apr 2022 14:45:44 +0200 Subject: [PATCH] =?UTF-8?q?Th=C3=A8me=20admin=20fontes=20available=20non?= =?UTF-8?q?=20charg=C3=A9e.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/core.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/core.php b/core/core.php index 7c469860..178529b1 100644 --- a/core/core.php +++ b/core/core.php @@ -2308,7 +2308,6 @@ class core extends common { /** * Charge les fontes websafe */ - $fontFile = ''; foreach ($fonts as $fontId) { if ( isset($fontsAvailable['websafe'][$fontId])) { $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; } } - // Ajoute le préconnect des fontes Googles. + // Ajoute le préconnect des fontes Google. $fontFile = $gf ? '' . $fontFile : $fontFile; // Enregistre la personnalisation @@ -2544,6 +2543,11 @@ class core extends common { // Version $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 * A partir du CDN ou dans le dossier site/file/source/fonts @@ -2557,7 +2561,6 @@ class core extends common { /** * Charge les fontes websafe */ - $fontFile = ''; foreach ($fonts as $fontId) { if ( isset($fontsAvailable['websafe'][$fontId])) { $fonts [$fontId] = $fontsAvailable['websafe'][$fontId]['font-family']; @@ -2598,6 +2601,8 @@ class core extends common { } } + + // Thème Administration $colors = helper::colorVariants($this->getData(['admin','backgroundColor'])); $css .= '#site{background-color:' . $colors['normal']. ';}';