Merge pull request #140 from Ashot-KR/fix-cyrillic-fonts

update Lato fonts files to fix cyrillic characters
strapi · Jul 20, 2020 · e64b993 · e64b993
2 parents 0f61a78 + a7f5bb6
commit e64b993
Show file tree

Hide file tree

Showing 13 changed files with 12 additions and 4 deletions.
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Black.ttf b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Black.ttf
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Black.woff b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Black.woff
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Black.woff2 b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Black.woff2
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Bold.ttf b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Bold.ttf
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Bold.woff b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Bold.woff
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Bold.woff2 b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Bold.woff2
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Regular.ttf b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Regular.ttf
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Regular.woff b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Regular.woff
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Regular.woff2 b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-Regular.woff2
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-SemiBold.ttf b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-SemiBold.ttf
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-SemiBold.woff b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-SemiBold.woff
diff --git a/packages/buffetjs-styles/src/assets/fonts/lato/Lato-SemiBold.woff2 b/packages/buffetjs-styles/src/assets/fonts/lato/Lato-SemiBold.woff2
diff --git a/packages/buffetjs-styles/src/components/Fonts/index.js b/packages/buffetjs-styles/src/components/Fonts/index.js
@@ -8,15 +8,23 @@ import faSolidHeavy2 from '@fortawesome/fontawesome-free/webfonts/fa-solid-900.w
 
 /* Lato Regular */
 import latoRegular from '../../assets/fonts/lato/Lato-Regular.ttf';
+import latoRegularWoff from '../../assets/fonts/lato/Lato-Regular.woff';
+import latoRegularWoff2 from '../../assets/fonts/lato/Lato-Regular.woff2';
 
 /* Lato SemiBold */
 import latoSemiBold from '../../assets/fonts/lato/Lato-SemiBold.ttf';
+import latoSemiBoldWoff from '../../assets/fonts/lato/Lato-SemiBold.woff';
+import latoSemiBoldWoff2 from '../../assets/fonts/lato/Lato-SemiBold.woff2';
 
 /* Lato Bold */
 import latoBold from '../../assets/fonts/lato/Lato-Bold.ttf';
+import latoBoldWoff from '../../assets/fonts/lato/Lato-Bold.woff';
+import latoBoldWoff2 from '../../assets/fonts/lato/Lato-Bold.woff2';
 
 /* Lato Black */
 import latoBlack from '../../assets/fonts/lato/Lato-Black.ttf';
+import latoBlackWoff from '../../assets/fonts/lato/Lato-Black.woff';
+import latoBlackWoff2 from '../../assets/fonts/lato/Lato-Black.woff2';
 
 const Font = createGlobalStyle`
 @font-face {
@@ -43,31 +51,31 @@ const Font = createGlobalStyle`
 /* Lato Regular - 400 */
 @font-face {
   font-family: 'Lato';
-  src: url(${latoRegular}) format('truetype');
+  src: url(${latoRegularWoff2}) format('woff2'), url(${latoRegularWoff}) format('woff'), url(${latoRegular}) format('truetype');
   font-weight: 400;
   font-style: normal;
 };
 
 /* Lato Semi-Bold - 500 */
 @font-face {
   font-family: 'Lato';
-  src: url(${latoSemiBold}) format('truetype');
+  src: url(${latoSemiBoldWoff2}) format('woff2'), url(${latoSemiBoldWoff}) format('woff'), url(${latoSemiBold}) format('truetype');
   font-weight: 500;
   font-style: normal;
 };
 
 /* Lato Bold - 600 */
 @font-face {
   font-family: 'Lato';
-  src: url(${latoBold}) format('truetype');
+  src: url(${latoBoldWoff2}) format('woff2'), url(${latoBoldWoff}) format('woff'), url(${latoBold}) format('truetype');
   font-weight: 600;
   font-style: normal;
 };
 
 /* Lato Black - 900 */
 @font-face {
   font-family: 'Lato';
-  src: url(${latoBlack}) format('truetype');
+  src:  url(${latoBlackWoff2}) format('woff2'), url(${latoBlackWoff}) format('woff'), url(${latoBlack}) format('truetype');
   font-weight: 900;
   font-style: normal;
 };`;