Fix font paths and consolidate.

seedlet/assets/css/fonts-editor.css

@@ -1,43 +0,0 @@
-/**
- * Font imports for the editor
- */
-@font-face {
-  font-family: 'Playfair Display';
-  font-display: swap;
-  font-style: normal;
-  font-weight: 100 400;
-  src: url("../fonts/Playfair_Display/static/PlayfairDisplay-Regular.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Playfair Display';
-  font-display: swap;
-  font-style: bold;
-  font-weight: 500 900;
-  src: url("../fonts/Playfair_Display/static/PlayfairDisplay-Bold.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Playfair Display';
-  font-display: swap;
-  font-style: italic;
-  src: url("../fonts/Playfair_Display/static/PlayfairDisplay-Italic.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Fira Sans';
-  font-display: swap;
-  font-style: normal;
-  font-weight: 100 400;
-  src: url("../fonts/Fira_Sans/FiraSans-Regular.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Fira Sans';
-  font-display: swap;
-  font-style: bold;
-  font-weight: 500 900;
-  src: url("../fonts/Fira_Sans/FiraSans-Bold.ttf") format("truetype"); }
-
-@font-face {
-  font-family: 'Fira Sans';
-  font-display: swap;
-  font-style: italic;
-  font-weight: 100 900;
-  src: url("../fonts/Fira_Sans/FiraSans-Italic.ttf") format("truetype"); }

seedlet/assets/css/fonts.css

@@ -1,43 +1,40 @@
-/**
- * Font imports for the editor
- */
 @font-face {
   font-family: 'Playfair Display';
   font-display: swap;
   font-style: normal;
   font-weight: 100 400;
-  src: url("./assets/fonts/Playfair_Display/static/PlayfairDisplay-Regular.ttf") format("truetype"); }
+  src: url("../fonts/Playfair_Display/static/PlayfairDisplay-Regular.ttf") format("truetype"); }
 
 @font-face {
   font-family: 'Playfair Display';
   font-display: swap;
   font-style: bold;
   font-weight: 500 900;
-  src: url("./assets/fonts/Playfair_Display/static/PlayfairDisplay-Bold.ttf") format("truetype"); }
+  src: url("../fonts/Playfair_Display/static/PlayfairDisplay-Bold.ttf") format("truetype"); }
 
 @font-face {
   font-family: 'Playfair Display';
   font-display: swap;
   font-style: italic;
-  src: url("./assets/fonts/Playfair_Display/static/PlayfairDisplay-Italic.ttf") format("truetype"); }
+  src: url("../fonts/Playfair_Display/static/PlayfairDisplay-Italic.ttf") format("truetype"); }
 
 @font-face {
   font-family: 'Fira Sans';
   font-display: swap;
   font-style: normal;
   font-weight: 100 400;
-  src: url("./assets/fonts/Fira_Sans/FiraSans-Regular.ttf") format("truetype"); }
+  src: url("../fonts/Fira_Sans/FiraSans-Regular.ttf") format("truetype"); }
 
 @font-face {
   font-family: 'Fira Sans';
   font-display: swap;
   font-style: bold;
   font-weight: 500 900;
-  src: url("./assets/fonts/Fira_Sans/FiraSans-Bold.ttf") format("truetype"); }
+  src: url("../fonts/Fira_Sans/FiraSans-Bold.ttf") format("truetype"); }
 
 @font-face {
   font-family: 'Fira Sans';
   font-display: swap;
   font-style: italic;
   font-weight: 100 900;
-  src: url("./assets/fonts/Fira_Sans/FiraSans-Italic.ttf") format("truetype"); }
+  src: url("../fonts/Fira_Sans/FiraSans-Italic.ttf") format("truetype"); }

seedlet/assets/sass/base/fonts/fonts-editor.scss

@@ -1,6 +0,0 @@
-/**
- * Font imports for the editor
- */
-
-@import "mixin";
-@include add_fonts( '..' );

seedlet/assets/sass/base/fonts/fonts.scss

@@ -1,6 +0,0 @@
-/**
- * Font imports for the front end
- */
-
-@import "mixin";
-@include add_fonts( './assets' );

seedlet/assets/sass/base/fonts/_mixin.scss → seedlet/assets/sass/fonts.scss

@@ -1,10 +1,9 @@
-@mixin add_fonts( $path ){
     @font-face {
         font-family: 'Playfair Display';
         font-display: swap;
         font-style: normal;
         font-weight: 100 400;
-        src: url( $path + '/fonts/Playfair_Display/static/PlayfairDisplay-Regular.ttf') format('truetype');
+        src: url( '../fonts/Playfair_Display/static/PlayfairDisplay-Regular.ttf') format('truetype');
     }
 
     @font-face {
@@ -12,14 +11,14 @@
         font-display: swap;
         font-style: bold;
         font-weight: 500 900;
-        src: url( $path + '/fonts/Playfair_Display/static/PlayfairDisplay-Bold.ttf') format('truetype');
+        src: url( '../fonts/Playfair_Display/static/PlayfairDisplay-Bold.ttf') format('truetype');
     }
 
     @font-face {
         font-family: 'Playfair Display';
         font-display: swap;
         font-style: italic;
-        src: url( $path + '/fonts/Playfair_Display/static/PlayfairDisplay-Italic.ttf') format('truetype');
+        src: url( '../fonts/Playfair_Display/static/PlayfairDisplay-Italic.ttf') format('truetype');
     }
 
     @font-face {
@@ -27,7 +26,7 @@
         font-display: swap;
         font-style: normal;
         font-weight: 100 400;
-        src: url( $path + '/fonts/Fira_Sans/FiraSans-Regular.ttf') format('truetype');
+        src: url( '../fonts/Fira_Sans/FiraSans-Regular.ttf') format('truetype');
     }
 
     @font-face {
@@ -35,7 +34,7 @@
         font-display: swap;
         font-style: bold;
         font-weight: 500 900;
-        src: url( $path + '/fonts/Fira_Sans/FiraSans-Bold.ttf') format('truetype');
+        src: url( '../fonts/Fira_Sans/FiraSans-Bold.ttf') format('truetype');
     }
 
     @font-face {
@@ -43,6 +42,5 @@
         font-display: swap;
         font-style: italic;
         font-weight: 100 900;
-        src: url( $path + '/fonts/Fira_Sans/FiraSans-Italic.ttf') format('truetype');
-    }
-}
+        src: url( '../fonts/Fira_Sans/FiraSans-Italic.ttf') format('truetype');
+    }

seedlet/functions.php

@@ -109,7 +109,7 @@ if ( ! function_exists( 'seedlet_setup' ) ) :
 		// Enqueue editor styles.
 		add_editor_style( 
 			array(
-				apply_filters( 'seedlet_editor_fonts', './assets/css/fonts-editor.css' ),
+				apply_filters( 'seedlet_editor_fonts', './assets/css/fonts.css' ),
 				'./assets/css/style-editor.css',
 			)
 		);
@@ -312,7 +312,7 @@ add_action( 'after_setup_theme', 'seedlet_content_width', 0 );
  */
 function seedlet_scripts() {
 	// Fonts 
-	wp_enqueue_style( 'seedlet-fonts', get_template_directory_uri() . '/assets/css/fonts.css', array(), wp_get_theme()->get( 'Version' ), 'print' );
+	wp_enqueue_style( 'seedlet-fonts', get_template_directory_uri() . '/assets/css/fonts.css', array(), wp_get_theme()->get( 'Version' ) );
 
 	// Theme styles
 	if (preg_match('~MSIE|Internet Explorer~i', $_SERVER['HTTP_USER_AGENT']) || (strpos($_SERVER['HTTP_USER_AGENT'], 'Trident/7.0; rv:11.0') !== false)) {

seedlet/package.json

@@ -39,7 +39,7 @@
   ],
   "scripts": {
     "start": "chokidar \"**/*.scss\" -c \"npm run build\" --initial",
-    "build:fonts": "node-sass assets/sass/base/fonts -o assets/css",
+    "build:fonts": "node-sass assets/sass/fonts.scss -o assets/css",
     "build:style": "node-sass assets/sass/style.scss style.css --output-style expanded --indent-type tab --indent-width 1",
     "build:style-editor": "node-sass assets/sass/style-editor.scss assets/css/style-editor.css --output-style expanded --indent-type tab --indent-width 1",
     "build:woocommerce": "node-sass assets/sass/style-woocommerce.scss assets/css/style-woocommerce.css --output-style expanded --indent-type tab --indent-width 1",

seedlet/style-rtl.css

@@ -1101,53 +1101,6 @@ footer {
 	background-color: var(--global--color-text-selection);
 }
 
-@font-face {
-	font-family: 'Playfair Display';
-	font-display: swap;
-	font-style: normal;
-	font-weight: 100 400;
-	src: url("./assets/fonts/Playfair_Display/static/PlayfairDisplay-Regular.ttf") format("truetype");
-}
-
-@font-face {
-	font-family: 'Playfair Display';
-	font-display: swap;
-	font-style: bold;
-	font-weight: 500 900;
-	src: url("./assets/fonts/Playfair_Display/static/PlayfairDisplay-Bold.ttf") format("truetype");
-}
-
-@font-face {
-	font-family: 'Playfair Display';
-	font-display: swap;
-	font-style: italic;
-	src: url("./assets/fonts/Playfair_Display/static/PlayfairDisplay-Italic.ttf") format("truetype");
-}
-
-@font-face {
-	font-family: 'Fira Sans';
-	font-display: swap;
-	font-style: normal;
-	font-weight: 100 400;
-	src: url("./assets/fonts/Fira_Sans/FiraSans-Regular.ttf") format("truetype");
-}
-
-@font-face {
-	font-family: 'Fira Sans';
-	font-display: swap;
-	font-style: bold;
-	font-weight: 500 900;
-	src: url("./assets/fonts/Fira_Sans/FiraSans-Bold.ttf") format("truetype");
-}
-
-@font-face {
-	font-family: 'Fira Sans';
-	font-display: swap;
-	font-style: italic;
-	font-weight: 100 900;
-	src: url("./assets/fonts/Fira_Sans/FiraSans-Italic.ttf") format("truetype");
-}
-
 /**
  * Elements
  * - Styles for basic HTML elemants