Commit 613ffb91 authored by Aleix Pol's avatar Aleix Pol 😾

Merge branch 'no-google-fonts' into 'master'

Serveix fonts localment

Closes #9

See merge request !28
parents 450e3873 a905b449
Pipeline #35160545 passed with stage
in 1 minute and 3 seconds
......@@ -18,7 +18,6 @@
{% endif %}
<link rel="stylesheet" href="{{ "/assets/main.css" | absolute_url }}">
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Krub:700|Roboto">
<link rel="canonical" href="{{ canonical }}">
{% assign feed_path = "/feed.xml" %}
{% if site.feed and site.feed.path %}
......@@ -27,46 +26,4 @@
<link rel="alternate" type="application/rss+xml" title="{{ site.title | escape }}" href="{{ feed_path | absolute_url }}">
{% include head_custom.html %}
{% if site.facebook_app_id %}
<meta property="fb:admins" content="{{ site.facebook_app_id }}">
<meta property="og:title" content="{{ title }}">
<meta property="og:site_name" content="{{ site.title | escape }}">
<meta property="og:url" content="{{ canonical }}">
<meta property="og:description" content="{{ description }}">
{% if site.facebook_page %}<meta property="article:author" content="{{ site.facebook_page }}">{% endif %}
{% if page.facebook.image %}
<meta property="og:image" content="{{ page.facebook.image }}">
{% elsif site.facebook_image %}
<meta property="og:image" content="{{ site.facebook_image }}">
{% endif %}
{% endif %}
<meta name="twitter:card" content="{{ page.twitter_card.type | default: "summary" }}">
{% if site.twitter_username %}<meta name="twitter:site" content="{{ site.twitter_username }}">{% endif %}
<meta name="twitter:title" content="{{ title | truncate: 70 }}">
<meta name="twitter:description" content="{{ description | truncate: 200 }}">
{% if page.twitter_card.creator %}
<meta name="twitter:creator" content="{{ page.twitter_card.creator }}">
{% elsif site.twitter_username %}
<meta name="twitter:creator" content="{{ site.twitter_username }}">
{% endif %}
{% if page.twitter_card.image %}
{% if page.twitter_card.type == 'gallery' %}
<meta name="twitter:image0" content="{{ page.twitter_card.image }}">
<meta name="twitter:image1" content="{{ page.twitter_card.image1 }}">
<meta name="twitter:image2" content="{{ page.twitter_card.image2 }}">
<meta name="twitter:image3" content="{{ page.twitter_card.image3 }}">
{% else %}
<meta name="twitter:image:src" content="{{ page.twitter_card.image }}">
{% if page.twitter_card.type == 'photo' %}
{% if page.twitter_card.width %}<meta name="twitter:image:width" content="{{ page.twitter_card.width }}">{% endif %}
{% if page.twitter_card.height %}<meta name="twitter:image:height" content="{{ page.twitter_card.height }}">{% endif %}
{% endif %}
{% endif %}
{% elsif site.twitter_image %}
<meta name="twitter:image:src" content="{{ site.twitter_image }}">
{% endif %}
{% include fonts.html %}
{% include google_analytics.html %}
</head>
@font-face {
font-family: 'Roboto';
font-style: normal;
font-weight: 400;
src: url('webfonts/roboto-v18-400.eot'); /* IE9 Compat Modes */
src: local('Roboto'), local('Roboto-Regular'),
url('webfonts/roboto-v18-400.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('webfonts/roboto-v18-400.woff2') format('woff2'), /* Super Modern Browsers */
url('webfonts/roboto-v18-400.woff') format('woff'), /* Modern Browsers */
url('webfonts/roboto-v18-400.ttf') format('truetype'), /* Safari, Android, iOS */
url('webfonts/roboto-v18-400.svg#Roboto') format('svg'); /* Legacy iOS */
}
@font-face {
font-family: 'Krub';
font-style: normal;
font-weight: 700;
src: url('webfonts/krub-v1-700.eot'); /* IE9 Compat Modes */
src: local('Krub Bold'), local('Krub-Bold'),
url('webfonts/krub-v1-700.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('webfonts/krub-v1-700.woff2') format('woff2'), /* Super Modern Browsers */
url('webfonts/krub-v1-700.woff') format('woff'), /* Modern Browsers */
url('webfonts/krub-v1-700.ttf') format('truetype'), /* Safari, Android, iOS */
url('webfonts/krub-v1-700.svg#Krub') format('svg'); /* Legacy iOS */
}
......@@ -49,3 +49,5 @@ $fa-font-path: "webfonts";
// Import partials from the `whiteglass` theme.
@import "whiteglass";
@import "webfonts";
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment