From 44e475ce7d0078293b8bef80b9fbf0d4ae0007c4 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Tue, 17 Oct 2017 16:23:37 +0200 Subject: [PATCH] Use npm package for Open Sans --- css/fonts.css | 4 ++-- package.json | 4 ++-- yarn.lock | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/css/fonts.css b/css/fonts.css index 1652037..94e85da 100644 --- a/css/fonts.css +++ b/css/fonts.css @@ -2,13 +2,13 @@ font-family: 'Open Sans'; font-style: normal; font-weight: 300; - src: local('Open Sans Light'), local('OpenSans-Light'), url(../node_modules/@bower_components/opensans-googlefont/OpenSans-Light.ttf); + src: local('Open Sans Light'), local('OpenSans-Light'), url(../node_modules/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(../node_modules/@bower_components/opensans-googlefont/OpenSans-Regular.ttf); + src: local('Open Sans'), local('OpenSans'), url(../node_modules/open-sans-fontface/fonts/Regular/OpenSans-Regular.ttf); } .small-font { diff --git a/package.json b/package.json index 2acdcc3..a2b8562 100644 --- a/package.json +++ b/package.json @@ -5,12 +5,12 @@ "author": "Pierre Rudloff", "bugs": "https://github.com/Rudloff/alltube/issues", "dependencies": { - "@bower_components/opensans-googlefont": "google-fonts-bower/opensans-bower#*", "grunt": "~1.0.1", "grunt-contrib-csslint": "~2.0.0", "grunt-contrib-cssmin": "~2.2.1", "grunt-contrib-uglify": "~3.1.0", - "grunt-potomo": "~3.5.0" + "grunt-potomo": "~3.5.0", + "open-sans-fontface": "~1.4.0" }, "devDependencies": { "grunt-contrib-compress": "~1.4.1", diff --git a/yarn.lock b/yarn.lock index 889968e..d7a5009 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,10 +2,6 @@ # yarn lockfile v1 -"@bower_components/opensans-googlefont@google-fonts-bower/opensans-bower#*": - version "0.0.0" - resolved "https://codeload.github.com/google-fonts-bower/opensans-bower/tar.gz/bcac718b7cc1299ca958c365193959ae4ff7d949" - "JSV@>= 4.0.x": version "4.0.2" resolved "https://registry.yarnpkg.com/JSV/-/JSV-4.0.2.tgz#d077f6825571f82132f9dffaed587b4029feff57" @@ -1185,6 +1181,10 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0: dependencies: wrappy "1" +open-sans-fontface@~1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/open-sans-fontface/-/open-sans-fontface-1.4.0.tgz#03cc6d1bf5e6a8b5b47910888562f722c5dd3428" + os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"