Browse Source

Inline CSS & JS

Track3 6 years ago
parent
commit
8f7a830e82

+ 4 - 8
assets/js/main.js

@@ -87,9 +87,7 @@ const mobileMenuToggle = () => {
   }
 }
 
-if (haveHeader == true) {
-  document.getElementById('menu-btn').addEventListener('click', mobileMenuToggle);
-}
+document.getElementById('menu-btn').addEventListener('click', mobileMenuToggle);
 
 // Show Featured Image
 //
@@ -137,11 +135,9 @@ if ((haveComments == true) && (comments.offsetTop < window.innerHeight)) {
 }
 
 window.addEventListener('scroll', throttle(() => {
-  if (haveHeader == true) {
-    autoHideHeader();
-    if (mobileMenuVisible == true) {
-      mobileMenuToggle();
-    }
+  autoHideHeader();
+  if (mobileMenuVisible == true) {
+    mobileMenuToggle();
   }
 
   if ((haveComments == true) && (commentsLoaded == false)) {

+ 0 - 4
layouts/404.html

@@ -12,8 +12,4 @@
 			</p>
 		</div>
 	</div>
-{{ end }}
-
-{{ define "footer" }}
-	<script>let haveHeader = false, haveComments = false;</script>
 {{ end }}

+ 3 - 4
layouts/_default/baseof.html

@@ -20,8 +20,9 @@
 	{{ range .AlternativeOutputFormats -}}
 		{{ printf `<link rel="%s" type="%s+%s" href="%s" title="%s" />` .Rel .MediaType.Type .MediaType.Suffix .Permalink $.Site.Title | safeHTML }}
 	{{ end -}}
-	{{ $style := resources.Get "scss/style.scss" | toCSS | minify | fingerprint -}}
-	<link rel="stylesheet" href="{{ $style.Permalink }}" {{ printf "integrity=%q" $style.Data.Integrity | safeHTMLAttr }}>
+	{{ with resources.Get "scss/style.scss" | toCSS | minify -}}
+	<style>{{ .Content | safeCSS }}</style>
+	{{- end }}
 	{{ block "head" . -}}{{- end }}
 </head>
 
@@ -29,8 +30,6 @@
 	{{ block "header" . -}}{{ end -}}
 	{{ block "main" . -}}{{ end -}}
 	{{ block "footer" . -}}{{ end }}
-	{{ $script := resources.Get "js/main.js" | minify | fingerprint -}}
-	<script src="{{ $script.Permalink }}" {{ printf "integrity=%q" $script.Data.Integrity | safeHTMLAttr }}></script>
 </body>
 
 </html>

+ 4 - 1
layouts/_default/list.html

@@ -30,5 +30,8 @@
 
 {{ define "footer" }}
 {{ partialCached "footer.html" . }}
-	<script>let haveHeader = true, haveComments = false;</script>
+	<script>
+		let haveComments=false;
+		{{- with resources.Get "js/main.js" | minify }}{{ .Content | safeJS }}{{ end }}
+	</script>
 {{ end }}

+ 4 - 1
layouts/_default/single.html

@@ -16,5 +16,8 @@
 
 {{ define "footer" }}
 {{ partialCached "footer.html" . }}
-	<script>let haveHeader = true, haveComments ={{.Params.comments}};</script>
+	<script>
+		let haveComments={{.Params.comments}};
+		{{- with resources.Get "js/main.js" | minify }}{{ .Content | safeJS }}{{ end }}
+	</script>
 {{ end }}

+ 0 - 4
layouts/index.html

@@ -17,8 +17,4 @@
 			<p>&copy; 2018 <a href="{{ .Site.BaseURL }}">{{ .Site.Author.name }}</a>. Some Rights Reserved.</p>
 		</div>
 	</div>
-{{ end }}
-
-{{ define "footer" }}
-	<script>let haveHeader = false, haveComments = false;</script>
 {{ end }}

+ 4 - 1
layouts/posts/single.html

@@ -50,5 +50,8 @@
 
 {{ define "footer" }}
 {{ partialCached "footer.html" . }}
-	<script>let haveHeader = true, haveComments = true;</script>
+	<script>
+		let haveComments=true;
+		{{- with resources.Get "js/main.js" | minify }}{{ .Content | safeJS }}{{ end }}
+	</script>
 {{ end }}