Remove CDN to match Theme Submission Guidelines #66

pacollins · 2019-08-16T01:18:22Z

Description

All resources have been downloaded to the theme directory so that there isn't a reliance on CDNs.

⚠️ Change and new parameter: .Site.Params.enableCDN defaults to false to adhere to guidelines. Setting to true enables CDNs.

Motivation and Context

Closes #56 and address Theme Submission Guidelines

Screenshots (if appropriate):

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Breaking change (fix or feature that would cause existing functionality to change)

Checklist:

I have read the Contributing Document.
My code follows the code style of this project.
My change requires a change to the documentation.
I have updated the documentation, including theme.toml, accordingly.

accesslint

There are accessibility issues in these changes.

static/js/jquery.min.js

static/js/fancybox.min.js

layouts/partials/head.html

pacollins · 2019-08-16T12:24:37Z

I agree, just getting the ball rolling now.

…

On Fri, Aug 16, 2019 at 3:37 AM Vincent Tam ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In layouts/partials/head.html <#66 (comment)> : > - <link rel="stylesheet" href="{{ "css/normalize.css" | relURL}}"> - <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700 <https://fonts.googleapis.com/css?family=Raleway:400,800,900%7CSource+Sans+Pro:400,700>"> - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/flag-icon-css/3.1.0/css/flag-icon.min.css"> - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/academicons/1.8.6/css/academicons.min.css"> - <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.9.0/css/all.css" integrity="sha384-i1LQnF23gykqWXg6jxC2ZbCbUMxyw5gLZY6UiUS98LYV5unm8GWmfkIS6jqJfb4E" crossorigin="anonymous"> - <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/fancybox/3.3.5/jquery.fancybox.min.css" /> - <link rel="stylesheet" href="{{ "css/main.min.css" | relURL }}"> - <link rel="stylesheet" href="{{ "css/add-on.css" | relURL }}"> - {{ else }} - <link rel="stylesheet" href="{{ . | relURL }}"> + {{ if .Site.Params.enableCDN }} + {{ if .Site.Params.highlightjs }}<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.9/styles/{{ <http://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.9/styles/%7B%7B> .Site.Params.highlightjsTheme | default "default" }}.min.css">{{ end }} + {{ range .Site.Params.cssFiles }} + {{ if eq . "default" }} + <link rel="stylesheet" href="{{ "css/normalize.css" | relURL}}"> + <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,800,900|Source+Sans+Pro:400,700 <https://fonts.googleapis.com/css?family=Raleway:400,800,900%7CSource+Sans+Pro:400,700>"> Since this involves main.scss, let's get #57 <#57> done first. — You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub <#66?email_source=notifications&email_token=ACWVJSJCCJUDYHFOPYH2TNDQEZKJ5A5CNFSM4IMDEED2YY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCBYI37Y#discussion_r314613107>, or mute the thread <https://github.com/notifications/unsubscribe-auth/ACWVJSMJUD2HOGTRJ5UIBX3QEZKJ5ANCNFSM4IMDEEDQ> .

pacollins · 2019-08-18T23:04:48Z

Now that I have explored Hugo Pipes (thanks @VincentTam), I think we should probably take the following approach (but want a second opinion before I start):

SCSS should be processed (as completed in Fixed intro section overlap & Hugo native SCSS #57)
All CSS and JS files should be bundle with like-kinds.
These two bundles should be minified
These two minified bundles should be fingerprinted.
The option enableCDN should default to false.

I don't think I missed anything, but this should really optimize everything.

pacollins · 2019-08-23T01:06:20Z

TODO:

Proper FontAwesome local integration
Replace 3rd party minified files with non-minified files (just in case someone wants to browse)
Add staticman.js

pacollins · 2019-08-24T05:26:21Z

I am missing Staticman files and when I have tried to rebase it has been kinda wonky. I'll let you look first. I think that is the only thing missing from this PR.

VincentTam

I'm working on the slices to get Staticman JS bundled with other assets.

layouts/partials/head.html

layouts/partials/scripts.html

VincentTam · 2019-08-24T15:07:33Z

Test results:

✔️ Staticman script has worked.
❌ 404 errors

layouts/partials/head.html

VincentTam · 2019-08-24T17:15:47Z

I am missing Staticman files and when I have tried to rebase it has been kinda wonky. I'll let you look first. I think that is the only thing missing from this PR.

Since we have resources in the form of slices, the append method can be used. Besides, I've condensed the loading of CSS assets by resources.Match "css/*.css".

pacollins · 2019-08-24T19:38:14Z

Curious your thoughts on having all the HLJS themes locally. Should we do that, or should we just keep that as a cdn thing (maybe keep default included)?

VincentTam · 2019-08-24T19:44:01Z

Let's keep them.
Edited: given that the themes are already under assets/css/styles/*.css, let's keep those CSS files.

Changes done at 09155a6

layouts/partials/head.html

pacollins · 2019-08-26T22:54:10Z

layouts/partials/scripts.html

+      {{ $js := $jsSlice | resources.Concat "js/localbundle.js" | resources.Minify | resources.Fingerprint }}
+    <script src="{{ $js.RelPermalink }}" integrity="{{ $js.Data.Integrity }}">
+    {{ else }}
+      <script src="{{ . | relURL }}"></script>


add-on.js is still dropped unless it is included in .Site.Params.jsFiles.

added back in site config file

pacollins · 2020-02-22T02:31:55Z

Hey @VincentTam - I know you have been just as busy as me (I am just jumping in to clean up some issues and PRs). Any chance life has slowed down enough for you to finish? If not I can.

…tion to explain their purpose.

pacollins · 2020-02-29T03:00:24Z

I believe those adjustments complete this PR.

pacollins · 2020-02-29T03:21:51Z

With CDN, there seems to be an odd thing happening with the NavBar Title Text. Can't track down the cause.

accesslint bot suggested changes Aug 16, 2019

View reviewed changes

static/js/jquery.min.js Outdated Show resolved Hide resolved

static/js/fancybox.min.js Outdated Show resolved Hide resolved

pacollins added Status: In Progress Type: Maintenance labels Aug 16, 2019

pacollins commented Aug 16, 2019

View reviewed changes

layouts/partials/head.html Outdated Show resolved Hide resolved

pacollins self-assigned this Aug 18, 2019

pacollins modified the milestones: 1.2.0, 1.1.0 Aug 22, 2019

pacollins changed the title ~~Remove CDN to match Theme Submission Guidelines~~ WIP: Remove CDN to match Theme Submission Guidelines Aug 23, 2019

pacollins mentioned this pull request Aug 23, 2019

⚑ → Language list #80

Merged

7 tasks

pacollins requested a review from VincentTam August 24, 2019 05:15

pacollins changed the title ~~WIP: Remove CDN to match Theme Submission Guidelines~~ Remove CDN to match Theme Submission Guidelines Aug 24, 2019

VincentTam previously requested changes Aug 24, 2019

View reviewed changes

layouts/partials/head.html Outdated Show resolved Hide resolved

layouts/partials/head.html Outdated Show resolved Hide resolved

layouts/partials/scripts.html Outdated Show resolved Hide resolved

layouts/partials/scripts.html Outdated Show resolved Hide resolved

VincentTam reviewed Aug 24, 2019

View reviewed changes

layouts/partials/head.html Outdated Show resolved Hide resolved

VincentTam mentioned this pull request Aug 25, 2019

BUG: What is the matter with add-on.js and add-on.css? #87

Closed

VincentTam self-assigned this Aug 26, 2019

VincentTam mentioned this pull request Aug 26, 2019

Added empty add-on.css and add-on.js files and extended the documenta… #88

Closed

pacollins commented Aug 26, 2019

View reviewed changes

layouts/partials/head.html Outdated Show resolved Hide resolved

pacollins commented Aug 26, 2019

View reviewed changes

layouts/partials/head.html Show resolved Hide resolved

pacollins commented Aug 26, 2019

View reviewed changes

layouts/partials/head.html Show resolved Hide resolved

pacollins commented Aug 26, 2019

View reviewed changes

pacollins mentioned this pull request Nov 5, 2019

Some changes to layout and CSS #102

Closed

6 tasks

pacollins referenced this pull request in pcolazurdo/hugo-future-imperfect-slim Feb 22, 2020

Modified to attribute original work

253a191

pacollins and others added 16 commits February 25, 2020 22:30

Update Example Site

047d617

Create local files and option to enable CDN

56feb50

Move from static to assets

839789f

css to hugo pipes

d89e6cf

js to hugo pipes

7347b72

Create local FontAwesome files

eea526f

Create local Academicons files

751aeb8

Create local JQuery files

3a6cae7

Create local Highlight.js files

47c9f7b

Create local Fancybox files

bb4c830

Update pipes and src

e9ff60d

Added Staticman JS & updated resources

f62ed9d

Fixed 404 errors

415ad92

Updated template to load HLJS CSS

1b9fb68

Added empty add-on.css and add-on.js files and extended the documenta…

ee3906b

…tion to explain their purpose.

Removed references to add-on.*

b81ded7

pacollins force-pushed the remove-cdn branch from 5741563 to b81ded7 Compare February 26, 2020 03:54

pacollins force-pushed the master branch from 047d617 to 9a96574 Compare February 26, 2020 04:05

pacollins added 3 commits February 25, 2020 23:08

Merge branch 'master' into remove-cdn

01962e5

Use JSON for resource loop

9b239cc

Update example site

51e7c2a

pacollins merged commit 506e066 into master Feb 29, 2020

pacollins deleted the remove-cdn branch February 29, 2020 03:40

pacollins mentioned this pull request Mar 13, 2020

Adjust exampleSite directories #123

Merged

7 tasks

pacollins mentioned this pull request May 19, 2020

BUG: hugo version 0.7 #141

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove CDN to match Theme Submission Guidelines #66

Remove CDN to match Theme Submission Guidelines #66

pacollins commented Aug 16, 2019

accesslint bot left a comment

pacollins commented Aug 16, 2019 via email

pacollins commented Aug 18, 2019 •

edited

Loading

pacollins commented Aug 23, 2019

pacollins commented Aug 24, 2019

VincentTam left a comment

VincentTam commented Aug 24, 2019

VincentTam commented Aug 24, 2019

pacollins commented Aug 24, 2019

VincentTam commented Aug 24, 2019 •

edited

Loading

pacollins Aug 26, 2019

VincentTam Aug 27, 2019

pacollins commented Feb 22, 2020

pacollins commented Feb 29, 2020

pacollins commented Feb 29, 2020

Remove CDN to match Theme Submission Guidelines #66

Remove CDN to match Theme Submission Guidelines #66

Conversation

pacollins commented Aug 16, 2019

Description

Motivation and Context

Screenshots (if appropriate):

Types of changes

Checklist:

accesslint bot left a comment

Choose a reason for hiding this comment

pacollins commented Aug 16, 2019 via email

pacollins commented Aug 18, 2019 • edited Loading

pacollins commented Aug 23, 2019

pacollins commented Aug 24, 2019

VincentTam left a comment

Choose a reason for hiding this comment

VincentTam commented Aug 24, 2019

VincentTam commented Aug 24, 2019

pacollins commented Aug 24, 2019

VincentTam commented Aug 24, 2019 • edited Loading

pacollins Aug 26, 2019

Choose a reason for hiding this comment

VincentTam Aug 27, 2019

Choose a reason for hiding this comment

pacollins commented Feb 22, 2020

pacollins commented Feb 29, 2020

pacollins commented Feb 29, 2020

pacollins commented Aug 18, 2019 •

edited

Loading

VincentTam commented Aug 24, 2019 •

edited

Loading