diff --git a/core/core.php b/core/core.php index 9aa800c7..db82eef8 100644 --- a/core/core.php +++ b/core/core.php @@ -194,6 +194,11 @@ class common { 'font-family' => '\'Arial Black\', Gadget, sans-serif', 'resource' => 'websafe' ], + 'arvo'=> [ + 'name' => 'Arvo', + 'font-family' => 'Arvo, sans-serif', + 'resource' => 'websafe' + ], 'courrier' => [ 'name' => 'Courier', 'font-family' => 'Courier, \'Liberation Mono\', monospace', @@ -219,11 +224,21 @@ class common { 'font-family' => 'Impact, Charcoal, sans-serif', 'resource' => 'websafe' ], + 'lora'=> [ + 'name' => 'Lora', + 'font-family' => 'Lora, serif', + 'resource' => 'websafe' + ], 'lucida' => [ 'name' => 'Lucida', 'font-family' => '\'Lucida Sans Unicode\', \'Lucida Grande\', sans-serif', 'resource' => 'websafe' ], + 'roboto'=> [ + 'name' => 'Roboto', + 'font-family' => 'Roboto, sans-serif', + 'resource' => 'websafe' + ], 'tahoma' => [ 'name' => 'Tahoma', 'font-family' => 'Tahoma, Geneva, sans-serif', diff --git a/core/include/update.inc.php b/core/include/update.inc.php index ec93c503..8a61d638 100644 --- a/core/include/update.inc.php +++ b/core/include/update.inc.php @@ -833,11 +833,6 @@ if ($this->getData(['core', 'dataVersion']) < 11400) { 'font-family' => 'Arimo, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/arimo' ], - 'arvo'=> [ - 'name' => 'Arvo', - 'font-family' => 'Arvo, sans-serif', - 'resource' => 'https://fonts.cdnfonts.com/css/arvo' - ], 'dancing-script' => [ 'name' => 'Dancing Script', 'font-family' => '\'Dancing Script\', sans-serif', @@ -883,11 +878,6 @@ if ($this->getData(['core', 'dataVersion']) < 11400) { 'font-family' => 'Lato, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/lato' ], - 'lora'=> [ - 'name' => 'Lora', - 'font-family' => 'Lora, serif', - 'resource' => 'https://fonts.cdnfonts.com/css/lora' - ], 'old-standard-tt-3'=> [ 'name' => 'Old Standard TT', 'font-family' => '\'Old Standard TT\', serif', @@ -918,11 +908,6 @@ if ($this->getData(['core', 'dataVersion']) < 11400) { 'font-family' => 'Rancho, sans-serif', 'resource' => 'https://fonts.cdnfonts.com/css/rancho' ], - 'roboto'=> [ - 'name' => 'Roboto', - 'font-family' => 'Roboto, sans-serif', - 'resource' => 'https://fonts.cdnfonts.com/css/roboto' - ], 'ubuntu'=> [ 'name' => 'Ubuntu', 'font-family' => 'Ubuntu, sans-serif', diff --git a/core/module/theme/theme.php b/core/module/theme/theme.php index 68962fe0..3c2b5ba2 100644 --- a/core/module/theme/theme.php +++ b/core/module/theme/theme.php @@ -1221,7 +1221,7 @@ class theme extends common { // Chargement de la police $fileContent .= '@font-face {' ; $fileContent .= 'font-family:"' . $fontValue['font-family'] . '";'; - $fileContent .= 'src: url("' . $fontValue['resource'] . '");'; + $fileContent .= 'src: local("' . $fontValue['name'] . '"), url("' . $fontValue['resource'] . '") format("woff");'; $fileContent .= '}' ; } }