compression added

This commit is contained in:
William Zhang 2018-02-17 19:18:57 -05:00
parent ca51221a6e
commit 6cef3231bd
7 changed files with 19 additions and 29 deletions

View File

@ -4,7 +4,8 @@
<meta name="theme-color" content="#1976D2" /> <meta name="theme-color" content="#1976D2" />
<meta name="viewport" content="width=device-width,height=device-height,initial-scale=1.0" /> <meta name="viewport" content="width=device-width,height=device-height,initial-scale=1.0" />
<link href="icons/favicon.ico" rel="icon" type="image/ico"> <link href="icons/favicon.ico" rel="icon" type="image/ico">
<link href="css/header.css" rel="stylesheet" async/> <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet"/>
<link href="css/main.css" rel="stylesheet" async/> <link href="css/header.css" rel="stylesheet"/>
<link href="css/footer.css" rel="stylesheet" async/> <link href="css/main.css" rel="stylesheet"/>
<link href="css/responsive.css" rel="stylesheet" async/> <link href="css/footer.css" rel="stylesheet"/>
<link href="css/responsive.css" rel="stylesheet"/>

10
_layouts/compress.html Normal file
View File

@ -0,0 +1,10 @@
---
# Jekyll layout that compresses HTML
# v3.0.2
# http://jch.penibelst.de/
# © 20142015 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 %}</{{ _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.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: "<pre" %}{% assign _content = "" %}{% for _pre_before in _pre_befores %}{% assign _pres = _pre_before | split: "</pre>" %}{% 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 "</pre>" %}<pre{{ _pres.first }}</pre>{% endif %}{% unless _pre_before contains "</pre>" 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 = " <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_comments %} <tr> <td>comments <td>{{ _profile_comments }}{% endif %}{% if _profile_collapse %} <tr> <td>collapse <td>{{ _profile_collapse }}{% endif %}{% if _profile_clippings %} <tr> <td>clippings <td>{{ _profile_clippings }}{% endif %} </table>{% endif %}{% endif %}

View File

@ -1,16 +1,15 @@
--- ---
layout: compress
permalink: /about permalink: /about
orgs: ["officers", "excomm", "senators", "sponsors"] orgs: ["officers", "excomm", "senators", "sponsors"]
--- ---
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link href="css/about.css" rel="stylesheet" /> <link href="css/about.css" rel="stylesheet" />
{% include head.html %} {% include head.html %}
<title>About - TJSGA</title> <title>About - TJSGA</title>
</head> </head>
<body> <body>
{% include header.html %} {% include header.html %}
<div id="wrapper" class="fluid"> <div id="wrapper" class="fluid">
@ -73,5 +72,4 @@ orgs: ["officers", "excomm", "senators", "sponsors"]
</div> </div>
{% include footer.html %} {% include footer.html %}
</body> </body>
</html> </html>

View File

@ -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/*/ /*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 { 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; font: inherit;

View File

@ -1,16 +1,15 @@
--- ---
layout: compress
permalink: /forms permalink: /forms
sections: ["general", "events", "elections"] sections: ["general", "events", "elections"]
--- ---
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link href="css/about.css" rel="stylesheet" /> <link href="css/about.css" rel="stylesheet" />
{% include head.html %} {% include head.html %}
<title>About - TJSGA</title> <title>About - TJSGA</title>
</head> </head>
<body> <body>
{% include header.html %} {% include header.html %}
<div id="wrapper" class="fluid"> <div id="wrapper" class="fluid">
@ -36,5 +35,4 @@ sections: ["general", "events", "elections"]
</div> </div>
{% include footer.html %} {% include footer.html %}
</body> </body>
</html> </html>

View File

@ -1,14 +1,13 @@
--- ---
layout: compress
permalink: / permalink: /
--- ---
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
{% include head.html %} {% include head.html %}
<title>Home - TJSGA</title> <title>Home - TJSGA</title>
</head> </head>
<body> <body>
{% include header.html %} {% include header.html %}
<div id="wrapper" class="fluid"> <div id="wrapper" class="fluid">
@ -60,5 +59,4 @@ permalink: /
</div> </div>
{% include footer.html %} {% include footer.html %}
</body> </body>
</html> </html>

View File

@ -1,14 +1,13 @@
--- ---
layout: compress
permalink: /resources permalink: /resources
--- ---
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
{% include head.html %} {% include head.html %}
<title>Resources - TJSGA</title> <title>Resources - TJSGA</title>
</head> </head>
<body> <body>
{% include header.html %} {% include header.html %}
<div id="wrapper" class="fluid"> <div id="wrapper" class="fluid">
@ -91,5 +90,4 @@ permalink: /resources
</div> </div>
{% include footer.html %} {% include footer.html %}
</body> </body>
</html> </html>