Skip to content

Commit

Permalink
Merge pull request getpelican#469 from chrismullins/update-bootstrap3…
Browse files Browse the repository at this point in the history
…-fontawesome

pelican-bootstrap3: Update FontAwesome to 4.7.0
  • Loading branch information
justinmayer authored Dec 31, 2016
2 parents 879826b + 5f7f676 commit 4299f87
Show file tree
Hide file tree
Showing 10 changed files with 3,225 additions and 576 deletions.
558 changes: 547 additions & 11 deletions pelican-bootstrap3/static/css/font-awesome.css

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions pelican-bootstrap3/static/css/font-awesome.css.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pelican-bootstrap3/static/css/font-awesome.min.css

Large diffs are not rendered by default.

Binary file modified pelican-bootstrap3/static/fonts/FontAwesome.otf
Binary file not shown.
Binary file modified pelican-bootstrap3/static/fonts/fontawesome-webfont.eot
Binary file not shown.
3,230 changes: 2,668 additions & 562 deletions pelican-bootstrap3/static/fonts/fontawesome-webfont.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified pelican-bootstrap3/static/fonts/fontawesome-webfont.ttf
Binary file not shown.
Binary file modified pelican-bootstrap3/static/fonts/fontawesome-webfont.woff
Binary file not shown.
Binary file modified pelican-bootstrap3/static/fonts/fontawesome-webfont.woff2
Binary file not shown.
2 changes: 1 addition & 1 deletion pelican-bootstrap3/templates/includes/sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
{% else %}
{% set name_sanitized = s[0]|lower|replace('+','-plus')|replace(' ','-') %}
{% endif %}
{% if name_sanitized in ['flickr', 'slideshare', 'spotify', 'stack-overflow', 'weibo', 'line-chart', 'home', 'user', 'users', 'envelope', 'envelope-o', 'stack-exchange', 'hacker-news'] %}
{% if name_sanitized in ['flickr', 'slideshare', 'spotify', 'stack-overflow', 'weibo', 'line-chart', 'home', 'user', 'users', 'envelope', 'envelope-o', 'stack-exchange', 'hacker-news', 'meetup', 'vk'] %}
{% set iconattributes = '"fa fa-' ~ name_sanitized ~ ' fa-lg"' %}
{% else %}
{% set iconattributes = '"fa fa-' ~ name_sanitized ~ '-square fa-lg"' %}
Expand Down

0 comments on commit 4299f87

Please sign in to comment.