[4.0] Imported google fonts without the use of @import (#23682)

joomla · Nov 28, 2019 · 551e356 · 551e356
1 parent 1821dfd
commit 551e356
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/templates/cassiopeia/index.php b/templates/cassiopeia/index.php
@@ -35,6 +35,10 @@
 
 // Load specific language related CSS
 HTMLHelper::_('stylesheet', 'language/' . $lang->getTag() . '/' . $lang->getTag() . '.css', array('version' => 'auto'));
+HTMLHelper::_('stylesheet', 'https://fonts.googleapis.com/css?family=Fira+Sans:400', []);
+
+// Preload the stylesheet for the font, actually we need to preload the font
+$this->getPreloadManager()->preload('https://fonts.googleapis.com/css?family=Fira+Sans:400', array('as' => 'stylesheet'));
 
 // Logo file or site title param
 if ($this->params->get('logoFile'))

diff --git a/templates/cassiopeia/scss/blocks/_global.scss b/templates/cassiopeia/scss/blocks/_global.scss
@@ -1,7 +1,5 @@
 // Global
 
-@import url('https://fonts.googleapis.com/css?family=Fira+Sans:400'); // @TODO - Move to script tag once webfontloader added to core.js
-
 html {
   font-size: $font-size-root;
 }