Skip to content

Commit 8219c66

Browse files
committed
Update Compress Layout
1 parent 4d1c292 commit 8219c66

5 files changed

Lines changed: 21 additions & 30 deletions

File tree

_includes/_comments.html

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{% if page.comments %}
22
<h3 id="comments" class="t60">{{ site.data.language.comments_headline }}</h3>
3-
43
<div id="disqus_thread"></div>
54
<script type="text/javascript">
65
/* * * CONFIGURATION VARIABLES: EDIT BEFORE PASTING INTO YOUR WEBPAGE * * */

_includes/_head.html

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
<link rel="stylesheet" type="text/css" href="{{ site.url }}{{ site.baseurl }}/assets/css/styles_feeling_responsive.css" />
55
<script src="{{ site.url }}{{ site.baseurl }}/assets/js/modernizr.min.js"></script>
66

7-
<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js"></script>
8-
<script>
9-
WebFont.load({
10-
google: {
11-
families: [ 'Lato:400,700,400italic:latin', 'Volkhov::latin' ]
12-
}
13-
});
14-
</script>
15-
16-
<noscript>
17-
<link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic|Volkhov' rel='stylesheet' type='text/css' />
18-
</noscript>
19-
20-
{% if site.google_site_verification %}<meta name="google-site-verification" content="{{ site.google_site_verification}}" />{% endif %}
7+
<script src="https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js"></script>
8+
<script>
9+
WebFont.load({
10+
google: {
11+
families: [ 'Lato:400,700,400italic:latin', 'Volkhov::latin' ]
12+
}
13+
});
14+
</script>
15+
16+
<noscript>
17+
<link href='http://fonts.googleapis.com/css?family=Lato:400,700,400italic|Volkhov' rel='stylesheet' type='text/css' />
18+
</noscript>
19+
20+
{% if site.google_site_verification %}<meta name="google-site-verification" content="{{ site.google_site_verification}}" />{% endif %}
2121
{% if site.bing_webmastertools_id %}<meta name="msvalidate.01" content="{{ site.bing_webmastertools_id }}" />{% endif %}
2222
{% if page.meta_description %}<meta name="description" content="{{ page.meta_description | strip_html | escape }}"/>{% elsif page.teaser %}<meta name="description" content="{{ page.teaser | strip_html | escape }}" />{% elsif site.description %}<meta name="description" content="{{ site.description | strip_html | escape }}" />{% endif %}
2323

_layouts/compress.html

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,11 @@
11
---
22
# Jekyll layout that compresses HTML
3-
# v1.3.0
3+
# v2.1.0
44
# http://jch.penibelst.de/
55
# © 2014–2015 Anatol Broder
66
# MIT License
77
---
88

9-
{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile or site.compress_html.debugging %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% case _pres.size %}{% when 2 %}{% capture _content %}{{ _content }}<pre{{ _pres.first }}</pre>{{ _pres.last | split: " " | join: " " }}{% endcapture %}{% when 1 %}{% capture _content %}{{ _content }}{{ _pres.last | split: " " | join: " " }}{% endcapture %}{% endcase %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments.size == 2 %}{% assign _comment_befores = _content | split: site.compress_html.comments.first %}{% for _comment_before in _comment_befores %}{% assign _comment_content = _comment_before | split: site.compress_html.comments.last | first %}{% if _comment_content %}{% capture _comment %}{{ site.compress_html.comments.first }}{{ _comment_content }}{{ site.compress_html.comments.last }}{% endcapture %}{% assign _content = _content | remove: _comment %}{% endif %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %}
10-
<table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile">
11-
<thead>
12-
<tr><td>Step<td>Bytes
13-
<tbody>
14-
<tr><td>raw<td>{{ content | size }}{% if _profile_endings %}
15-
<tr><td>endings<td>{{ _profile_endings }}{% endif %}{% if _profile_collapse %}
16-
<tr><td>collapse<td>{{ _profile_collapse }}{% endif %}{% if _profile_comments %}
17-
<tr><td>comments<td>{{ _profile_comments }}{% endif %}{% if _profile_clippings %}
18-
<tr><td>clippings<td>{{ _profile_clippings }}{% endif %}
19-
</table>{% endif %}{% endif %}
9+
{% if site.compress_html.ignore.envs contains jekyll.environment %}{{ content }}{% else %}{% capture _content %}{{ content }}{% endcapture %}{% assign _profile = site.compress_html.profile %}{% if site.compress_html.endings == "all" %}{% assign _endings = "html head body li dt dd p rt rp optgroup option colgroup caption thead tbody tfoot tr td th" | split: " " %}{% else %}{% assign _endings = site.compress_html.endings %}{% endif %}{% for _element in _endings %}{% capture _end %}</{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _end %}{% endfor %}{% if _profile and _endings %}{% assign _profile_endings = _content | size | plus: 1 %}{% endif %}{% for _element in site.compress_html.startings %}{% capture _start %}<{{ _element }}>{% endcapture %}{% assign _content = _content | remove: _start %}{% endfor %}{% if _profile and site.compress_html.startings %}{% assign _profile_startings = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.ignore.whitespaces %}{% assign _random = site.time | date: "%s%N" %}{% if site.compress_html.ignore.whitespaces contains "SPACE" %}{% capture _ignore_space %} {% endcapture %}{% capture _freeze_space %}space{{ _random }}{% endcapture %}{% capture _join %}
10+
{% endcapture %}{% else %}{% capture _ignore_space %}{% endcapture %}{% capture _freeze_space %}{% endcapture %}{% capture _join %} {% endcapture %}{% endif %}{% if site.compress_html.ignore.whitespaces contains "LINE FEED" %}{% capture _ignore_line_feed %}
11+
{% endcapture %}{% capture _freeze_line_feed %}line_feed{{ _random }}{% endcapture %}{% else %}{% capture _ignore_line_feed %}{% endcapture %}{% capture _freeze_line_feed %}{% endcapture %}{% endif %}{% if site.compress_html.ignore.whitespaces contains "CHARACTER TABULATION" %}{% capture _ignore_character_tabulation %} {% endcapture %}{% capture _freeze_character_tabulation %}character_tabulation{{ _random }}{% endcapture %}{% else %}{% capture _ignore_character_tabulation %}{% endcapture %}{% capture _freeze_character_tabulation %}{% endcapture %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% if _pres.size != 0 %}{% if site.compress_html.ignore.whitespaces %}{% assign _pres_after = _pres.last | replace: _ignore_space, _freeze_space | replace: _ignore_line_feed, _freeze_line_feed | replace: _ignore_character_tabulation, _freeze_character_tabulation | split: " " | join: _join | replace: _freeze_character_tabulation, _ignore_character_tabulation | replace: _freeze_line_feed, _ignore_line_feed | replace: _freeze_space, _ignore_space %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% case _pres.size %}{% when 2 %}{% capture _content %}{{ _content }}<pre{{ _pres.first }}</pre>{{ _pres_after }}{% endcapture %}{% when 1 %}{% capture _content %}{{ _content }}{{ _pres_after }}{% endcapture %}{% endcase %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% endif %}{% if site.compress_html.comments == "all" %}{% assign _comments = "<!-- -->" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% assign _comment_befores = _content | split: _comments.first %}{% for _comment_before in _comment_befores %}{% assign _comment_content = _comment_before | split: _comments.last | first %}{% if _comment_content %}{% capture _comment %}{{ _comments.first }}{{ _comment_content }}{{ _comments.last }}{% endcapture %}{% assign _content = _content | remove: _comment %}{% endif %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% if site.compress_html.clippings == "all" %}{% assign _clippings = "html head title base link meta style body article section nav aside h1 h2 h3 h4 h5 h6 hgroup header footer address p hr blockquote ol ul li dl dt dd figure figcaption main div table caption colgroup col tbody thead tfoot tr td th" | split: " " %}{% else %}{% assign _clippings = site.compress_html.clippings %}{% endif %}{% for _element in _clippings %}{% assign _edges = " <e;<e; </e>;</e>;</e> ;</e>" | replace: "e", _element | split: ";" %}{% assign _content = _content | replace: _edges[0], _edges[1] | replace: _edges[2], _edges[3] | replace: _edges[4], _edges[5] %}{% endfor %}{% if _profile and _clippings %}{% assign _profile_clippings = _content | size | plus: 1 %}{% endif %}{{ _content }}{% if _profile %} <table id="compress_html_profile_{{ site.time | date: "%Y%m%d" }}" class="compress_html_profile"> <thead> <tr> <td>Step <td>Bytes <tbody> <tr> <td>raw <td>{{ content | size }}{% if _profile_endings %} <tr> <td>endings <td>{{ _profile_endings }}{% endif %}{% if _profile_startings %} <tr> <td>startings <td>{{ _profile_startings }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}

_sass/_02_settings_typography.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
@charset "utf-8";
22
/* TOC – Typography variables
33
4-
Modular Scale › http://modularscale.com/scale/?px1=16&px2=36&ra1=1.25&ra2=0
4+
Modular Scale › http://www.modularscale.com//?16,36&px&1.25&web&table
55
66
- Fonts
77
- Font Weight

pages/pages-root-folder/feed.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ title: "RSS Feed"
44
permalink: /feed.xml
55
---
66
<?xml version="1.0" encoding="UTF-8"?>
7-
<?xml-stylesheet type="text/xsl" href="{{ site.baseurl }}/assets/xslt/rss.xslt" ?>
8-
<?xml-stylesheet type="text/css" href="{{ site.baseurl }}/assets/css/rss.css" ?>
7+
<?xml-stylesheet type="text/xsl" href="{{ site.url }}{{ site.baseurl }}/assets/xslt/rss.xslt" ?>
8+
<?xml-stylesheet type="text/css" href="{{ site.url }}{{ site.baseurl }}/assets/css/rss.css" ?>
99
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
1010
<channel>
1111
<title>{{ site.title | xml_escape }}</title>

0 commit comments

Comments
 (0)