From 6cef3231bd66010cd2252b8543dec0db124efa99 Mon Sep 17 00:00:00 2001 From: William Zhang Date: Sat, 17 Feb 2018 19:18:57 -0500 Subject: [PATCH] compression added --- _includes/head.html | 9 +++++---- _layouts/compress.html | 10 ++++++++++ about.html | 4 +--- css/main.css | 13 ------------- forms.html | 4 +--- index.html | 4 +--- resources.html | 4 +--- 7 files changed, 19 insertions(+), 29 deletions(-) create mode 100644 _layouts/compress.html diff --git a/_includes/head.html b/_includes/head.html index 5a053eb..322a330 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -4,7 +4,8 @@ - - - - + + + + + diff --git a/_layouts/compress.html b/_layouts/compress.html new file mode 100644 index 0000000..8248010 --- /dev/null +++ b/_layouts/compress.html @@ -0,0 +1,10 @@ +--- +# Jekyll layout that compresses HTML +# v3.0.2 +# http://jch.penibelst.de/ +# © 2014–2015 Anatol Broder +# MIT License +--- + +{% capture _LINE_FEED %} +{% endcapture %}{% 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 %}{% 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.comments == "all" %}{% assign _comments = "" | split: " " %}{% else %}{% assign _comments = site.compress_html.comments %}{% endif %}{% if _comments.size == 2 %}{% capture _comment_befores %}.{{ _content }}{% endcapture %}{% assign _comment_befores = _comment_befores | split: _comments.first %}{% for _comment_before in _comment_befores %}{% if forloop.first %}{% continue %}{% endif %}{% capture _comment_outside %}{% if _carry %}{{ _comments.first }}{% endif %}{{ _comment_before }}{% endcapture %}{% capture _comment %}{% unless _carry %}{{ _comments.first }}{% endunless %}{{ _comment_outside | split: _comments.last | first }}{% if _comment_outside contains _comments.last %}{{ _comments.last }}{% assign _carry = false %}{% else %}{% assign _carry = true %}{% endif %}{% endcapture %}{% assign _content = _content | remove_first: _comment %}{% endfor %}{% if _profile %}{% assign _profile_comments = _content | size | plus: 1 %}{% endif %}{% endif %}{% assign _pre_befores = _content | split: "" %}{% assign _pres_after = "" %}{% if _pres.size != 0 %}{% if site.compress_html.blanklines %}{% assign _lines = _pres.last | split: _LINE_FEED %}{% capture _pres_after %}{% for _line in _lines %}{% assign _trimmed = _line | split: " " | join: " " %}{% if _trimmed != empty or forloop.last %}{% unless forloop.first %}{{ _LINE_FEED }}{% endunless %}{{ _line }}{% endif %}{% endfor %}{% endcapture %}{% else %}{% assign _pres_after = _pres.last | split: " " | join: " " %}{% endif %}{% endif %}{% capture _content %}{{ _content }}{% if _pre_before contains "" %}{% endif %}{% unless _pre_before contains "" and _pres.size == 1 %}{{ _pres_after }}{% endunless %}{% endcapture %}{% endfor %}{% if _profile %}{% assign _profile_collapse = _content | size | plus: 1 %}{% 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 = " ;; ;" | 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 %}
Step Bytes
raw {{ content | size }}{% if _profile_endings %}
endings {{ _profile_endings }}{% endif %}{% if _profile_startings %}
startings {{ _profile_startings }}{% endif %}{% if _profile_comments %}
comments {{ _profile_comments }}{% endif %}{% if _profile_collapse %}
collapse {{ _profile_collapse }}{% endif %}{% if _profile_clippings %}
clippings {{ _profile_clippings }}{% endif %}
{% endif %}{% endif %} diff --git a/about.html b/about.html index 80fb43f..2c520e7 100644 --- a/about.html +++ b/about.html @@ -1,16 +1,15 @@ --- +layout: compress permalink: /about orgs: ["officers", "excomm", "senators", "sponsors"] --- - {% include head.html %} About - TJSGA - {% include header.html %}
@@ -73,5 +72,4 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
{% include footer.html %} - diff --git a/css/main.css b/css/main.css index a14e630..85a88b6 100644 --- a/css/main.css +++ b/css/main.css @@ -1,16 +1,3 @@ -/*@font-face { - font-family: OpenSans; - src: url('../fonts/OpenSans/OpenSans-Regular.ttf') -} - -@font-face { - font-family: OpenSans; - font-weight: bold; - src: url('../fonts/OpenSans/OpenSans-Bold.ttf') -}*/ - -@import url('https://fonts.googleapis.com/css?family=Lato'); - /*http://meyerweb.com/eric/tools/css/reset/*/ html,body,div,span,button,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video { font: inherit; diff --git a/forms.html b/forms.html index a16ab6f..04825b2 100644 --- a/forms.html +++ b/forms.html @@ -1,16 +1,15 @@ --- +layout: compress permalink: /forms sections: ["general", "events", "elections"] --- - {% include head.html %} About - TJSGA - {% include header.html %}
@@ -36,5 +35,4 @@ sections: ["general", "events", "elections"]
{% include footer.html %} - diff --git a/index.html b/index.html index b697517..9eb0da5 100644 --- a/index.html +++ b/index.html @@ -1,14 +1,13 @@ --- +layout: compress permalink: / --- - {% include head.html %} Home - TJSGA - {% include header.html %}
@@ -60,5 +59,4 @@ permalink: /
{% include footer.html %} - diff --git a/resources.html b/resources.html index 28eea2e..0192bf0 100644 --- a/resources.html +++ b/resources.html @@ -1,14 +1,13 @@ --- +layout: compress permalink: /resources --- - {% include head.html %} Resources - TJSGA - {% include header.html %}
@@ -91,5 +90,4 @@ permalink: /resources
{% include footer.html %} -