From 3ba720dce06a0e364a59be55d81841549e77e060 Mon Sep 17 00:00:00 2001
From: Pierre Rudloff <contact@rudloff.pro>
Date: Mon, 20 Jul 2020 23:03:28 +0200
Subject: [PATCH] Get open-sans from Packagist So we can stop requiring Asset
 Packagist

---
 composer.json          |  6 +-----
 composer.lock          | 43 +++++++++++++++++++++++-------------------
 css/fonts.css          | 20 --------------------
 css/style.css          |  8 ++++++++
 templates/inc/head.tpl |  2 +-
 5 files changed, 34 insertions(+), 45 deletions(-)
 delete mode 100644 css/fonts.css

diff --git a/composer.json b/composer.json
index 09f755a..904bb0b 100644
--- a/composer.json
+++ b/composer.json
@@ -27,12 +27,12 @@
     "jawira/case-converter": "^3.4",
     "jean85/pretty-package-versions": "^1.3",
     "mathmarques/smarty-view": "^1.1",
-    "npm-asset/open-sans-fontface": "^1.4",
     "rinvex/countries": "^6.1",
     "rudloff/alltube-library": "dev-develop",
     "symfony/finder": "^5.0",
     "symfony/translation": "^4.0",
     "symfony/yaml": "^4.0",
+    "webfontkit/open-sans": "^1.0",
     "ytdl-org/youtube-dl": "^2020.06",
     "zonuexe/http-accept-language": "^0.4.1"
   },
@@ -66,10 +66,6 @@
     }
   },
   "repositories": [
-    {
-      "type": "composer",
-      "url": "https://asset-packagist.org"
-    },
     {
       "type": "package",
       "package": {
diff --git a/composer.lock b/composer.lock
index d709377..37c4679 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d0a5c7e93a6d08ce781d72a85dff85ab",
+    "content-hash": "33751d511fe2a384c6fa74542d7defb1",
     "packages": [
         {
             "name": "aura/session",
@@ -618,24 +618,6 @@
             ],
             "time": "2018-02-13T20:26:39+00:00"
         },
-        {
-            "name": "npm-asset/open-sans-fontface",
-            "version": "1.4.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/FontFaceKit/open-sans.git",
-                "reference": "2285c0300e6a4c8b102b98fb030fb38c26aa081c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/FontFaceKit/open-sans/zipball/2285c0300e6a4c8b102b98fb030fb38c26aa081c",
-                "reference": "2285c0300e6a4c8b102b98fb030fb38c26aa081c"
-            },
-            "type": "npm-asset",
-            "license": [
-                "Apache License version 2.0"
-            ]
-        },
         {
             "name": "pimple/pimple",
             "version": "v3.3.0",
@@ -1833,6 +1815,29 @@
             "homepage": "https://symfony.com",
             "time": "2019-11-12T14:51:11+00:00"
         },
+        {
+            "name": "webfontkit/open-sans",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webfontkit/open-sans.git",
+                "reference": "00ab31e690edfd0d88f9ffbcd998cf298b9687e9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webfontkit/open-sans/zipball/00ab31e690edfd0d88f9ffbcd998cf298b9687e9",
+                "reference": "00ab31e690edfd0d88f9ffbcd998cf298b9687e9",
+                "shasum": ""
+            },
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "Apache-2.0"
+            ],
+            "description": "Open Sans is a humanist sans serif typeface designed by Steve Matteson, Type Director of Ascender Corp. This version contains the complete 897 character set, which includes the standard ISO Latin 1, Latin CE, Greek and Cyrillic character sets. Open Sans was designed with an upright stress, open forms and a neutral, yet friendly appearance. It was optimized for print, web, and mobile interfaces, and has excellent legibility characteristics in its letterforms.",
+            "homepage": "http://www.google.com/fonts/specimen/Open+Sans",
+            "time": "2014-08-20T20:43:34+00:00"
+        },
         {
             "name": "ytdl-org/youtube-dl",
             "version": "2020.06.16.1",
diff --git a/css/fonts.css b/css/fonts.css
deleted file mode 100644
index 0bda134..0000000
--- a/css/fonts.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 300;
-    src: local('Open Sans Light'), local('OpenSans-Light'), url(../vendor/npm-asset/open-sans-fontface/fonts/Light/OpenSans-Regular.ttf);
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: local('Open Sans'), local('OpenSans'), url(../vendor/npm-asset/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf);
-}
-
-.small-font {
-    font-size: 13px;
-}
-
-.large-font {
-    font-size:24px;
-}
diff --git a/css/style.css b/css/style.css
index 482ff25..8e6c098 100644
--- a/css/style.css
+++ b/css/style.css
@@ -6,6 +6,14 @@ body {
   text-align: center;
 }
 
+.small-font {
+  font-size: 13px;
+}
+
+.large-font {
+  font-size:24px;
+}
+
 /* Header */
 
 header {
diff --git a/templates/inc/head.tpl b/templates/inc/head.tpl
index 7b2f3d4..db940f5 100644
--- a/templates/inc/head.tpl
+++ b/templates/inc/head.tpl
@@ -8,7 +8,7 @@
         <meta name="twitter:description" content="{$description|escape}"/>
         <meta property="og:description" content="{$description|escape}"/>
     {/if}
-    <link rel="stylesheet" href="{base_url}/css/fonts.css"/>
+    <link rel="stylesheet" href="{base_url}/vendor/webfontkit/open-sans/open-sans.css"/>
     <link rel="stylesheet" href="{base_url}/css/style.css"/>
     <title>{$config->appName}{if isset($title)} - {$title|escape}{/if}</title>
     <link rel="canonical" href="{$canonical}"/>