Skip to content

Commit 976c1cb

Browse files
jputrinojputrino
authored
Merge pull request #2 from nginxinc/use-local-files
feat: Use local files
2 parents ba7d518 + f58bad5 commit 976c1cb

30 files changed

+8034
-1390
lines changed

‎assets/css/kube.css

Lines changed: 0 additions & 1308 deletions
This file was deleted.

‎assets/fontawesome/css/all.css

Lines changed: 7955 additions & 0 deletions
Large diffs are not rendered by default.

‎assets/fontawesome/css/all.min.css

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/fontawesome/css/v4-font-face.min.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/fontawesome/css/v4-shims.min.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/fontawesome/css/v5-font-face.min.css

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎assets/js/all.min.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎assets/js/jquery-3-6-4.min.js

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎go.mod

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module github.com/nginxinc/nginx-hugo-theme
2+
3+
go 1.19

‎layouts/_default/baseof.html

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,35 @@
44
<head>
55
{{ block "head" . }}
66

7-
{{ partial "meta.html" . }}
7+
{{ partial "meta.html" . }}
88

9-
{{ partial "favicon.html" . }}
9+
{{ partial "favicon.html" . }}
1010

11-
{{ partial "styles.html" . }}
11+
{{ partial "styles.html" . }}
1212

13-
{{ if in .Params.doctypes "devportal" }}
14-
{{ partial "devportal/style.html" . }}
15-
{{ end }}
16-
17-
{{ if fileExists "/layouts/partials/head_custom.html" }}
18-
{{ partial "head_custom.html" . }}
19-
{{ end }}
13+
{{ if in .Params.doctypes "devportal" }}
14+
{{ partial "devportal/style.html" . }}
15+
{{ end }}
2016

21-
{{ partial "load_jquery.html" . }}
17+
{{ if fileExists "/layouts/partials/head_custom.html" }}
18+
{{ partial "head_custom.html" . }}
19+
{{ end }}
2220

23-
{{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
21+
{{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
2422

25-
{{ partial "trustarc.html" . }}
23+
{{ partial "trustarc.html" . }}
2624

27-
{{ partial "tealium-profile.html" . }}
25+
{{ partial "tealium-profile.html" . }}
2826

29-
{{ end }}
27+
{{ end }}
3028

3129
{{ end }}
3230

3331
</head>
3432

3533
<body>
3634
{{ if or ( not .Site.IsServer ) ( not ( in .Site.Params.buildtype "package" ) ) }}
37-
{{ partial "universal-tag.html" . }}
35+
{{ partial "universal-tag.html" . }}
3836
{{ end }}
3937

4038
<header>

‎layouts/partials/footer.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,14 @@
6868
<div class="col-md-2 d-none d-md-block">
6969
<span class="footer-head">Social</span>
7070
<ul class="footer-social">
71-
<li><a href="https://www.facebook.com/nginxinc" title="facebook" aria-label="facebook" target="_blank" rel="noreferrer"><i class="fa fa-facebook-square fa-lg" aria-hidden="true"></i>
71+
<li><a href="https://www.facebook.com/nginxinc" title="facebook" aria-label="facebook" target="_blank" rel="noreferrer"><i class="fa-brands fa-facebook" aria-hidden="true"></i>
7272
Facebook</a></li>
73-
<li><a href="https://twitter.com/nginx" title="twitter" aria-label="twitter" target="_blank" rel="noreferrer"><i class="fa fa-twitter fa-lg" aria-hidden="true"></i>Twitter</a></li>
74-
<li><a href="https://www.linkedin.com/company/nginx" title="linkedin" aria-label="linkedin" target="_blank" rel="noreferrer"><i class="fa fa-linkedin-square fa-lg" aria-hidden="true"></i>
73+
<li><a href="https://twitter.com/nginx" title="twitter" aria-label="twitter" target="_blank" rel="noreferrer"><i class="fa-brands fa-twitter" aria-hidden="true"></i>Twitter</a></li>
74+
<li><a href="https://www.linkedin.com/company/nginx" title="linkedin" aria-label="linkedin" target="_blank" rel="noreferrer"><i class="fa-brands fa-linkedin" aria-hidden="true"></i>
7575
LinkedIn</a></li>
76-
<li><a href="https://www.youtube.com/user/NginxInc" title="youtube" aria-label="youtube" target="_blank" rel="noreferrer" alt="NGINX Youtube Channel"><i class="fa fa-youtube-square fa-lg" aria-hidden="true"></i>
76+
<li><a href="https://www.youtube.com/user/NginxInc" title="youtube" aria-label="youtube" target="_blank" rel="noreferrer" alt="NGINX Youtube Channel"><i class="fa-brands fa-square-youtube" aria-hidden="true"></i>
7777
YouTube</a></li>
78-
<li><a href="https://www.nginx.com/feed/" title="rss" aria-label="rss" target="_blank" ><i class="fa fa-rss-square fa-lg" aria-hidden="true"></i>
78+
<li><a href="https://www.nginx.com/feed/" title="rss" aria-label="rss" target="_blank" ><i class="fa fa-rss-square" aria-hidden="true"></i>
7979
RSS</a></li>
8080
</ul>
8181
</div>

‎layouts/partials/load_jquery.html

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎layouts/partials/meta.html

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,9 @@
3939

4040

4141
{{/* set custom CSP to load styles and scripts with special handling for GTM scripts (requires unsafe-inline) and Dev Portal page(s) (requires 'unsafe-eval') */}}
42-
<meta http-equiv="Content-Security-Policy" content="script-src
43-
'self'
44-
https://code.jquery.com/
45-
https://cdn.jsdelivr.net/
46-
https://static.cloud.coveo.com
47-
https://kit.fontawesome.com/
48-
https://*.netlify.app
49-
https://gist.github.com
42+
<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline'
43+
https://consent.trustarc.com/ https://mktg.tags.f5.com/basic/prod/utag.sync.js https://static.cloud.coveo.com/ https://*.f5.com/
44+
https://*.netlify.app https://gist.github.com
5045
https://tag.demandbase.com/pscSDsz4.min.js
5146
https://munchkin.brightfunnel.com/js/build/bf-munchkin.min.js
5247
https://www.googletagmanager.com/gtm.js
@@ -55,11 +50,8 @@
5550
https://www.google-analytics.com/plugins/ua/linkid.js
5651
https://cdn.bizible.com/scripts/bizible.js
5752
https://cdn.bizible.com/xdc.js
58-
https://consent.trustarc.com/
5953
https://f5networksglobalprod.122.2o7.net/
6054
https://f5networksnginxdocs.122.2o7.net/
61-
https://*.f5.com
62-
'unsafe-inline'
6355
{{ if in .Params.doctypes "devportal" }} 'unsafe-eval' {{end}};
6456
worker-src 'self' blob:">
6557
{{/* end */}}

‎layouts/partials/scripts.html

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,26 @@
1-
{{ $kubejs := resources.Get "/js/kube.js" }}
1+
{{ $jquery := resources.Get "/js/jquery-3-6-4.min.js" }}
22

3-
{{ if .Site.IsServer }}
4-
<script src="{{ $kubejs.RelPermalink }}"></script>
5-
{{ else }}
6-
{{ $kubejs := $kubejs | minify | fingerprint "sha512" }}
7-
<script src="{{ $kubejs.RelPermalink }}" type="text/javascript" integrity="{{ $kubejs.Data.Integrity }}"></script>
8-
{{ end }}
3+
<script src="{{ $jquery.RelPermalink }}" type="text/javascript" integrity="{{ $jquery.Data.Integrity }}"></script>
94

10-
{{ if in .Site.Params.buildtype "package" }}
5+
{{ $kubejs := resources.Get "/js/kube.js" | minify | fingerprint "sha512" }}
6+
<script src="{{ $kubejs.RelPermalink }}" type="text/javascript" integrity="{{ $kubejs.Data.Integrity }}"></script>
117

12-
<!-- load FontAwesome from assets -->
13-
{{ $jsFA := resources.Get "js/all.min.js" | fingerprint }}
14-
<script src="{{ $jsFA.RelPermalink }}" type="text/javascript" integrity="{{ $jsFA.Data.Integrity }}"></script>
158

169
<!-- load Bootstrap from local assets -->
17-
{{ $jsBootstrap := resources.Get "js/bootstrap.bundle.min.js" | fingerprint }}
18-
<script src="{{ $jsBootstrap.RelPermalink }}" type="text/javascript" integrity="{{ $jsBootstrap.Data.Integrity }}"></script>
19-
20-
{{ else }}
21-
22-
<!-- Load Bootstrap from CDN -->
23-
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.bundle.min.js" integrity="sha384-Piv4xVNRyMGpqkS2by6br4gNJ7DXjqk09RmUpJ8jgGtD7zP9yug3goQfGII0yAns" crossorigin="anonymous"></script>
24-
<!-- end Bootstrap -->
10+
{{ $jsBootstrap := resources.Get "js/bootstrap.bundle.min.js" | fingerprint "sha512" }}
11+
<script src="{{ $jsBootstrap.RelPermalink }}" type="text/javascript" integrity="{{ $jsBootstrap.Data.Integrity }}"></script>
2512

26-
<!-- Don't need to load FontAwesome here as it's handled in partials/styles.html -->
27-
28-
{{ end }}
2913

3014
{{ if ( not ( in .Site.Params.buildtype "package" ) ) }}
3115
<!-- START COVEO -->
3216

33-
<script class="coveo-script" src="https://static.cloud.coveo.com/searchui/v2.8959/js/CoveoJsSearch.Lazy.min.js"></script>
17+
<script class="coveo-script" src="https://static.cloud.coveo.com/searchui/v2.8959/js/CoveoJsSearch.Lazy.min.js"></script>
3418

35-
<script src="https://static.cloud.coveo.com/searchui/v2.8959/js/templates/templates.js"></script>
19+
<script src="https://static.cloud.coveo.com/searchui/v2.8959/js/templates/templates.js"></script>
3620

37-
{{ $coveo := resources.Get "js/coveo.js" }}
38-
{{ $secureCoveo := $coveo | minify | fingerprint "sha512" }}
39-
<script src="{{ $secureCoveo.RelPermalink }}" integrity="{{ $secureCoveo.Data.Integrity }}" type="text/javascript"></script>
21+
{{ $coveo := resources.Get "js/coveo.js" }}
22+
{{ $secureCoveo := $coveo | minify | fingerprint "sha512" }}
23+
<script src="{{ $secureCoveo.RelPermalink }}" integrity="{{ $secureCoveo.Data.Integrity }}" type="text/javascript"></script>
4024

4125
<!-- END COVEO -->
4226
{{ end }}
@@ -48,10 +32,11 @@
4832
{{ $redoc := $redoc | fingerprint "sha512" }}
4933

5034
<!-- only load the redoc js if we're on an api reference page -->
51-
{{ if and (in .Params.doctypes "reference") (in .Params.tags "api") }}<script src="{{$redoc.RelPermalink}}" type="text/javascript"></script>{{ end }}
35+
{{ if and (in .Params.doctypes "reference") (in .Params.tags "api") }}
36+
<script src="{{$redoc.RelPermalink}}" type="text/javascript"></script>{{ end }}
5237

5338
{{ end }}
5439

5540
<!-- Load Sidebar javascript -->
56-
{{ $jsSidebar := resources.Get "js/sidebar.js" | fingerprint }}
57-
<script src="{{ $jsSidebar.RelPermalink }}" type="text/javascript" integrity="{{ $jsSidebar.Data.Integrity }}"></script>
41+
{{ $jsSidebar := resources.Get "js/sidebar.js" | minify | fingerprint "sha512" }}
42+
<script src="{{ $jsSidebar.RelPermalink }}" type="text/javascript" integrity="{{ $jsSidebar.Data.Integrity }}"></script>

‎layouts/partials/styles.html

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,20 @@
55
{{ $css5 := resources.Get "css/highlight.css" }}
66
{{ $css6 := resources.Get "css/coveo.css" }}
77

8-
{{ if in .Site.Params.buildtype "package" }}
98

109
<!-- load FontAwesome from assets -->
11-
{{ $cssFA := resources.Get "css/all.min.css" | fingerprint }}
12-
<link href="{{ $cssFA.RelPermalink }}" integrity="{{ $cssFA.Data.Integrity }}" rel="stylesheet" type="text/css">
10+
{{ $cssFA1 := resources.Get "fontawesome/css/all.min.css" | fingerprint "sha512" }}
11+
<link href="{{ $cssFA1.RelPermalink }}" integrity="{{ $cssFA1.Data.Integrity }}" rel="stylesheet" type="text/css">
12+
13+
{{ $cssFA2 := resources.Get "fontawesome/css/v4-font-face.min.css" | fingerprint "sha512" }}
14+
<link href="{{ $cssFA2.RelPermalink }}" integrity="{{ $cssFA2.Data.Integrity }}" rel="stylesheet" type="text/css">
15+
16+
{{ $cssFA3 := resources.Get "fontawesome/css/v5-font-face.min.css" | fingerprint "sha512" }}
17+
<link href="{{ $cssFA3.RelPermalink }}" integrity="{{ $cssFA3.Data.Integrity }}" rel="stylesheet" type="text/css">
1318

1419
<!-- load Bootstrap from local assets -->
15-
{{ $cssBootstrap := resources.Get "css/bootstrap.min.css" | fingerprint }}
16-
<link href="{{ $cssBootstrap.RelPermalink }}" integrity="{{ $cssBootstrap.Data.Integrity }}" rel="stylesheet" type="text/css">
17-
18-
{{ else }}
19-
20-
<!-- load FontAwesome from CDN -->
21-
<script src="https://kit.fontawesome.com/94f08dfe9d.js" crossorigin="anonymous"></script>
22-
<!-- load Bootstrap from CDN -->
23-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-B0vP5xmATw1+K9KRQjQERJvTumQW0nPEzvF6L/Z6nronJ3oUOFUFpCjEUQouq2+l" crossorigin="anonymous">
24-
{{ end }}
20+
{{ $cssBootstrap := resources.Get "css/bootstrap.min.css" | fingerprint "sha512" }}
21+
<link href="{{ $cssBootstrap.RelPermalink }}" integrity="{{ $cssBootstrap.Data.Integrity }}" rel="stylesheet" type="text/css">
2522

2623
{{ if ( not ( in .Site.Params.buildtype "package" ) ) }}
2724
<!-- load Coveo CSS -->

‎static/css/webfonts/fa-brands-400.woff2

-102 KB
Binary file not shown.

‎static/css/webfonts/fa-regular-400.ttf

-59 KB
Binary file not shown.

‎static/css/webfonts/fa-regular-400.woff2

-23.3 KB
Binary file not shown.

‎static/css/webfonts/fa-solid-900.ttf

-296 KB
Binary file not shown.

‎static/css/webfonts/fa-solid-900.woff2

-124 KB
Binary file not shown.

‎static/css/webfonts/fa-v4compatibility.ttf

-10.3 KB
Binary file not shown.

‎static/css/webfonts/fa-v4compatibility.woff2

-4.84 KB
Binary file not shown.

‎static/css/webfonts/fa-brands-400.ttf renamed to ‎static/fontawesome/webfonts/fa-brands-400.ttf

176 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-brands-400.woff2

105 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-regular-400.ttf

62.2 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-regular-400.woff2

24.3 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-solid-900.ttf

386 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-solid-900.woff2

146 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-v4compatibility.ttf

9.93 KB
Binary file not shown.

‎static/fontawesome/webfonts/fa-v4compatibility.woff2

4.43 KB
Binary file not shown.

0 commit comments

Comments
 (0)