Skip to content
Permalink
Browse files
[zen] Font Awesome update to v4.7.0 + theme fork with Fork Awesome v1…
….0.11 (#152)

* update Font Awesome icons in zen themes v4.7.0

* new zen variant uses Fork Awesome icon font

* Font Awesome/Bitter fonts now used via CDN, deleted redundant local stored files/code, fixed bundles file

* zen-jinja: FA/Bitter fonts -> CDN, deletion of now redundant files/code

* zen-ipython: FA/Bitter fonts -> CDN

* zen-forkawesome theme now uses parent's main.css, no local font files, correct icon use in conf.py.sample

* Remove unnecessary font-awesome LESS files
  • Loading branch information
encarsia authored and Kwpolska committed May 10, 2018
1 parent 16dbe78 commit a2450f228b7e6992dccaa376cef7c885d90304d3
Showing with 275 additions and 10,814 deletions.
  1. +2 −0 v7/zen-forkawesome/AUTHORS.txt
  2. +16 −0 v7/zen-forkawesome/README.md
  3. +8 −0 v7/zen-forkawesome/assets/css/forkfont.css
  4. +2 −0 v7/zen-forkawesome/bundles
  5. +11 −0 v7/zen-forkawesome/conf.py.sample
  6. +1 −0 v7/zen-forkawesome/parent
  7. +161 −0 v7/zen-forkawesome/templates/arusahni_helper.tmpl
  8. +9 −0 v7/zen-forkawesome/zen-forkawesome.theme
  9. +1 −2 v7/zen-ipython/bundles
  10. +7 −7 v7/zen-ipython/conf.py.sample
  11. +4 −12 v7/zen-ipython/templates/arusahni_helper.tmpl
  12. +0 −22 v7/zen-jinja/assets/css/bitter.css
  13. +11 −1,472 v7/zen-jinja/assets/css/main.css
  14. BIN v7/zen-jinja/assets/fonts/FontAwesome.otf
  15. BIN v7/zen-jinja/assets/fonts/SHIcXhdd5RknatSgOzyEkA.woff
  16. BIN v7/zen-jinja/assets/fonts/eMS0tViDqryBl0EG1pqFZfesZW2xOQ-xsNqO47m55DA.woff
  17. BIN v7/zen-jinja/assets/fonts/evC1haE-MsorTl_A7_uSGT8E0i7KZn-EPnyo3HZu7kw.woff
  18. BIN v7/zen-jinja/assets/fonts/fontawesome-webfont.eot
  19. +0 −399 v7/zen-jinja/assets/fonts/fontawesome-webfont.svg
  20. BIN v7/zen-jinja/assets/fonts/fontawesome-webfont.ttf
  21. BIN v7/zen-jinja/assets/fonts/fontawesome-webfont.woff
  22. +1 −2 v7/zen-jinja/bundles
  23. +7 −7 v7/zen-jinja/conf.py.sample
  24. +0 −84 v7/zen-jinja/less/font-awesome-3.2.1/bootstrap.less
  25. +0 −129 v7/zen-jinja/less/font-awesome-3.2.1/core.less
  26. +0 −93 v7/zen-jinja/less/font-awesome-3.2.1/extras.less
  27. +0 −1,953 v7/zen-jinja/less/font-awesome-3.2.1/font-awesome-ie7.less
  28. +0 −33 v7/zen-jinja/less/font-awesome-3.2.1/font-awesome.less
  29. +0 −381 v7/zen-jinja/less/font-awesome-3.2.1/icons.less
  30. +0 −48 v7/zen-jinja/less/font-awesome-3.2.1/mixins.less
  31. +0 −22 v7/zen-jinja/less/font-awesome-3.2.1/path.less
  32. +0 −735 v7/zen-jinja/less/font-awesome-3.2.1/variables.less
  33. +0 −1 v7/zen-jinja/less/main.less
  34. +3 −3 v7/zen-jinja/less/type.less
  35. +4 −12 v7/zen-jinja/templates/arusahni_helper.tmpl
  36. +0 −22 v7/zen/assets/css/bitter.css
  37. +11 −1,472 v7/zen/assets/css/main.css
  38. BIN v7/zen/assets/fonts/FontAwesome.otf
  39. BIN v7/zen/assets/fonts/SHIcXhdd5RknatSgOzyEkA.woff
  40. BIN v7/zen/assets/fonts/eMS0tViDqryBl0EG1pqFZfesZW2xOQ-xsNqO47m55DA.woff
  41. BIN v7/zen/assets/fonts/evC1haE-MsorTl_A7_uSGT8E0i7KZn-EPnyo3HZu7kw.woff
  42. BIN v7/zen/assets/fonts/fontawesome-webfont.eot
  43. +0 −399 v7/zen/assets/fonts/fontawesome-webfont.svg
  44. BIN v7/zen/assets/fonts/fontawesome-webfont.ttf
  45. BIN v7/zen/assets/fonts/fontawesome-webfont.woff
  46. +1 −2 v7/zen/bundles
  47. +7 −7 v7/zen/conf.py.sample
  48. +0 −84 v7/zen/less/font-awesome-3.2.1/bootstrap.less
  49. +0 −129 v7/zen/less/font-awesome-3.2.1/core.less
  50. +0 −93 v7/zen/less/font-awesome-3.2.1/extras.less
  51. +0 −1,953 v7/zen/less/font-awesome-3.2.1/font-awesome-ie7.less
  52. +0 −33 v7/zen/less/font-awesome-3.2.1/font-awesome.less
  53. +0 −381 v7/zen/less/font-awesome-3.2.1/icons.less
  54. +0 −48 v7/zen/less/font-awesome-3.2.1/mixins.less
  55. +0 −22 v7/zen/less/font-awesome-3.2.1/path.less
  56. +0 −735 v7/zen/less/font-awesome-3.2.1/variables.less
  57. +0 −1 v7/zen/less/main.less
  58. +3 −3 v7/zen/less/type.less
  59. +4 −12 v7/zen/templates/arusahni_helper.tmpl
  60. +1 −1 v7/zen/zen.theme
@@ -0,0 +1,2 @@
Damián Avila <https://github.com/damianavila>
Anke K <https://github.com/encarsia>
@@ -0,0 +1,16 @@
This is the `zen` theme modified to use icons from the [ForkAwesome](https://forkawesome.github.io) project instead of the originally used [FontAwesome](http://fontawesome.io) icons.

The zen and zen-based themes are very customizable, so to make these themes work, you have to use this [conf.py](https://github.com/damianavila/damian_blog/blob/master/conf.py), obviously with your custom changes ;-)

More info about the zen themes family [here](http://www.damian.oquanta.info/posts/nikolas-zen-theme-finally-released.html).

Enjoy!

Damián

**WARNING:**
The zen themes are LESS-powered (not less... because it is more-powered ;-))
If you use webassests (USE_BUNDLES = True in your conf.py), the theme will use compiled css files, so don't worry at all...
But, if you want to build the css files from the zen LESS files, you have to use USE_BUNDLES = False, and have installed the `lessc` (official LESS compiler).
Additionaly, you have a LESS plugin available in the Nikola plugins repo to automatically build the LESS files inside `nikola build` command.
You can easily install it just doing: `nikola plugin -i less`.
@@ -0,0 +1,8 @@
/* use Fork Awesome font family */

[class^="fa-"],
[class*=" fa-"],
.post .meta .authordate:before,
.post .meta .stats a:after {
font-family: ForkAwesome;
}
@@ -0,0 +1,2 @@
assets/css/all.css=rst.css,code.css,main.css,forkfont.css,custom.css
assets/js/all-nocdn.js=jquery-1.10.2.min.js,jquery.timeago.js
@@ -0,0 +1,11 @@
NAVIGATION_LINKS = {
DEFAULT_LANG: (
('/index.html', 'Home', 'fa fa-home'),
('/archive.html', 'Archives', 'fa fa-folder-open'),
('/categories/index.html', 'Tags', 'fa fa-tags'),
('/rss.xml', 'RSS', 'fa fa-rss'),
('https://getnikola.com', 'About me', 'fa fa-user'),
('https://twitter.com/getnikola', 'My Twitter', 'fa fa-twitter'),
('https://github.com/getnikola', 'My Github', 'fa fa-github'),
)
}
@@ -0,0 +1 @@
zen
@@ -0,0 +1,161 @@
## -*- coding: utf-8 -*-
## Override only the functions that differ from base or boopstrap/templates/base_helper.tmpl
<%def name="html_headstart()">
<!DOCTYPE html>
<html
\
% if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']) or (comment_system == 'facebook'):
prefix='\
%if use_open_graph or (twitter_card and twitter_card['use_twitter_cards']):
og: http://ogp.me/ns# \
%endif
%if use_open_graph:
article: http://ogp.me/ns/article# \
%endif
%if comment_system == 'facebook':
fb: http://ogp.me/ns/fb# \
%endif
'\
%endif
\
% if is_rtl:
dir="rtl" \
% endif
\
lang="${lang}">
<head>
<meta charset="utf-8">
%if description:
<meta name="description" content="${description}">
%endif
<meta name="viewport" content="width=device-width">
<title>${title|striphtml} | ${blog_title|striphtml}</title>

${html_stylesheets()}
${html_feedlinks()}
%if permalink:
<link rel="canonical" href="${abs_link(permalink)}">
%endif

%if favicons:
%for name, file, size in favicons:
<link rel="${name}" href="${file}" sizes="${size}"/>
%endfor
%endif

% if comment_system == 'facebook':
<meta property="fb:app_id" content="${comment_system_id}">
% endif

%if use_cdn:
<!--[if lt IE 9]><script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
%else:
<!--[if lt IE 9]><script src="/assets/js/html5.js"></script><![endif]-->
%endif

${extra_head_data}
</%def>

<%def name="html_stylesheets()">
<link href="//fonts.googleapis.com/css?family=Bitter:400,400i,700" rel="stylesheet" type="text/css">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/fork-awesome@1.0.11/css/fork-awesome.min.css" integrity="sha256-MGU/JUq/40CFrfxjXb5pZjpoZmxiP2KuICN5ElLFNd8=" crossorigin="anonymous">
%if use_bundles:
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
%else:
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
<link href="/assets/css/main.css" rel="stylesheet" type="text/css">
<link href="/assets/css/forkfont.css" rel="stylesheet" type="text/css">
%if has_custom_css:
<link href="/assets/css/custom.css" rel="stylesheet" type="text/css">
%endif
%endif
% if annotations and post and not post.meta('noannotations'):
${notes.css()}
% elif not annotations and post and post.meta('annotations'):
${notes.css()}
% endif
</%def>

<%def name="late_load_js()">
%if use_bundles:
%if use_cdn:
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.1.0/jquery.timeago.min.js"></script>
%else:
<script src="/assets/js/all-nocdn.js" type="text/javascript"></script>
%endif
%else:
%if use_cdn:
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery-timeago/1.1.0/jquery.timeago.min.js"></script>
%else:
<script src="/assets/js/jquery-1.10.2.min.js" type="text/javascript"></script>
<script src="/assets/js/jquery.timeago.js" type="text/javascript"></script>
%endif
%endif
${social_buttons_code}
</%def>

<%def name="html_feedlinks()">
%if rss_link:
${rss_link}
%elif generate_rss:
%if len(translations) > 1:
%for language in translations:
<link rel="alternate" type="application/rss+xml" title="RSS (${language})" href="${_link('rss', None, language)}">
%endfor
%else:
<link rel="alternate" type="application/rss+xml" title="RSS" href="${_link('rss', None)}">
%endif
%endif
</%def>

<%def name="html_navigation_links()">
%for url, text, icon in navigation_links[lang]:
% if rel_link(permalink, url) == "#":
<li><a href="${url}" title="${text}"><i class="${icon}"></i></a></li>
%else:
<li><a href="${url}" title="${text}"><i class="${icon}"></i></a></li>
%endif
%endfor
</%def>

## Override only the functions that differ from base/templates/post_helper.tmpl
<%def name="html_tags(post)">
%if post.tags:
<div itemprop="keywords" class="tags">
<ul>
${messages("Tags")}&nbsp;:&nbsp;
%for tag in post.tags:
<li><a class="tag p-category" href="${_link('tag', tag)}" rel="tag">${tag}</a></li>
%endfor
</ul>
</div>
%endif
</%def>

## Override only the functions that differ from base/templates/post_header.tmpl
<%def name="html_title()">
%if title and not post.meta('hidetitle'):
<h1 class="p-name entry-title" itemprop="headline name">${title|h}</h1>
%endif
</%def>

<%def name="html_translations(post)">
% if len(translations) > 1:
% for langname in translations.keys():
% if langname != lang and post.is_translation_available(langname):
<a href="${post.permalink(langname)}" rel="alternate" hreflang="${langname}">
${messages("LANGUAGE", langname)}</a>
% endif
% endfor
% endif
</%def>

<%def name="html_sourcelink()">
% if show_sourcelink:
&nbsp;&nbsp;|&nbsp;&nbsp;
<a href="${post.source_link()}" id="sourcelink">${messages("Source")}</a>
% endif
</%def>
@@ -0,0 +1,9 @@
[Theme]
engine = mako
parent = zen
author = Damián Avila, Anke K
author_url = http://www.damian.oquanta.info/
license = MIT

[Family]
family = zen
@@ -1,3 +1,2 @@
assets/css/all-nocdn.css=bitter.css,main.css,rst.css,code.css,ipython.min.css,nikola_ipython.css,custom.css
assets/css/all.css=main.css,rst.css,code.css,ipython.min.css,nikola_ipython.css,custom.css
assets/css/all.css=rst.css,code.css,main.css,ipython.min.css,nikola_ipython.css,custom.css
assets/js/all-nocdn.js=jquery-1.10.2.min.js,jquery.timeago.js,toggle.js,miniPageNav.js
@@ -1,11 +1,11 @@
NAVIGATION_LINKS = {
DEFAULT_LANG: (
('/index.html', 'Home', 'icon-home'),
('/archive.html', 'Archives', 'icon-folder-open-alt'),
('/categories/index.html', 'Tags', 'icon-tags'),
('/rss.xml', 'RSS', 'icon-rss'),
('https://getnikola.com', 'About me', 'icon-user'),
('https://twitter.com/getnikola', 'My Twitter', 'icon-twitter'),
('https://github.com/getnikola', 'My Github', 'icon-github'),
('/index.html', 'Home', 'fa fa-home'),
('/archive.html', 'Archives', 'fa fa-folder-open'),
('/categories/index.html', 'Tags', 'fa fa-tags'),
('/rss.xml', 'RSS', 'fa fa-rss'),
('https://getnikola.com', 'About me', 'fa fa-user'),
('https://twitter.com/getnikola', 'My Twitter', 'fa fa-twitter'),
('https://github.com/getnikola', 'My Github', 'fa fa-github'),
)
}
@@ -57,22 +57,14 @@ lang="{{ lang }}">
{% endmacro %}

{% macro html_stylesheets() %}
<link href="//fonts.googleapis.com/css?family=Bitter:400,400i,700" rel="stylesheet" type="text/css">
<link href="https://stackpath.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN" crossorigin="anonymous">
{% if use_bundles %}
{% if use_cdn %}
<link href='//fonts.googleapis.com/css?family=Bitter:400,400italic,700' rel='stylesheet' type='text/css'>
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
{% else %}
<link href="/assets/css/all-nocdn.css" rel="stylesheet" type="text/css">
{% endif %}
<link href="/assets/css/all.css" rel="stylesheet" type="text/css">
{% else %}
{% if use_cdn %}
<link href='//fonts.googleapis.com/css?family=Bitter:400,400italic,700' rel='stylesheet' type='text/css'>
{% else %}
<link href="/assets/css/bitter.css" rel="stylesheet" type="text/css">
{% endif %}
<link href="/assets/css/main.css" rel="stylesheet" type="text/css">
<link href="/assets/css/rst.css" rel="stylesheet" type="text/css">
<link href="/assets/css/code.css" rel="stylesheet" type="text/css">
<link href="/assets/css/main.css" rel="stylesheet" type="text/css">
<link href="/assets/css/ipython.min.css" rel="stylesheet" type="text/css">
<link href="/assets/css/nikola_ipython.css" rel="stylesheet" type="text/css">
{% if has_custom_css %}

This file was deleted.

0 comments on commit a2450f2

Please sign in to comment.