fix: regression #114

Signed-off-by: weru <[email protected]>
onweru · Jul 9, 2023 · 085109b · 085109b
1 parent af3e133
commit 085109b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 60 deletions.
diff --git a/exampleSite/config.toml b/exampleSite/config.toml
@@ -3,8 +3,8 @@ title = "Compose Docs"
 enableRobotsTXT = true
 # this example loads the theme as hugo module
 # comment out line below, and uncomment the line after it if you prefer to load the theme normally
-theme = ["github.com/onweru/compose"] # edit this if you'ld rather use a fork of this repo
-# theme = "compose"
+# theme = ["github.com/onweru/compose"] # edit this if you'ld rather use a fork of this repo
+theme = "compose"
 enableGitInfo = true
 
 # disableKinds = ["taxonomy", "taxonomyTerm"]

diff --git a/exampleSite/content/docs/compose/shortcodes-example.md b/exampleSite/content/docs/compose/shortcodes-example.md
@@ -12,9 +12,9 @@ draft: true
 ```sh
 {{</* block "grid-2" */>}}
 {{</* column */>}}
-#### Coumn 1 
+#### Coumn 1
 
-Lorem ipsum dolor sit amet, 
+Lorem ipsum dolor sit amet,
 ...
 
 {{</* button "https://github.com/onweru/compose" "Download Theme" */>}}
@@ -27,11 +27,11 @@ Lorem ipsum dolor sit amet,
 
 {{< block "grid-2" >}}
 {{< column >}}
-#### Coumn 1 
+#### Coumn 1
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
 
-dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 
 Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
 
@@ -44,9 +44,9 @@ Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu
 #### Coumn 2
 
 
-Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et 
+Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et
 
-> dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+> dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
 
 Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
 

diff --git a/exampleSite/go.mod b/exampleSite/go.mod
@@ -2,6 +2,4 @@ module compose-exampleSite
 
 go 1.19
 
-require (
-	github.com/onweru/compose v0.0.0-20230709140616-b352d2c11cd8 // indirect
-)
+require github.com/onweru/compose v0.0.0-20230709163331-af3e133abf10 // indirect
diff --git a/exampleSite/go.sum b/exampleSite/go.sum
@@ -1,2 +1,2 @@
-github.com/onweru/compose v0.0.0-20230709140616-b352d2c11cd8 h1:6D3uUi+TB00CDWbDCmWpJVjzYAy8KcCZ4a7Is36BrzI=
-github.com/onweru/compose v0.0.0-20230709140616-b352d2c11cd8/go.mod h1:tf1kQIBUcwJ/3mRFU5eiMrMvsDScVTK2IEFsZE3hZOc=
+github.com/onweru/compose v0.0.0-20230709163331-af3e133abf10 h1:6+OU3YpznL1bAy1s4B9KhEteRN+qo5T9vgYTWuGHpLw=
+github.com/onweru/compose v0.0.0-20230709163331-af3e133abf10/go.mod h1:tf1kQIBUcwJ/3mRFU5eiMrMvsDScVTK2IEFsZE3hZOc=
diff --git a/exampleSite/netlify.toml b/exampleSite/netlify.toml
@@ -4,28 +4,28 @@ publish = "public"
 command = "hugo --gc --minify --baseURL https://docs.neuralvibes.com/"
 
 [context.production.environment]
-HUGO_VERSION = "0.111.2"
+HUGO_VERSION = "0.115.2"
 HUGO_ENV = "production"
 HUGO_ENABLEGITINFO = "true"
 
 [context.split1]
 command = "hugo --gc --minify --enableGitInfo"
 
 [context.split1.environment]
-HUGO_VERSION = "0.111.2"
+HUGO_VERSION = "0.115.2"
 HUGO_ENV = "production"
 
 [context.deploy-preview]
 command = "hugo --gc --minify --buildFuture -b $DEPLOY_PRIME_URL"
 
 [context.deploy-preview.environment]
-HUGO_VERSION = "0.111.2"
+HUGO_VERSION = "0.115.2"
 
 [context.branch-deploy]
 command = "hugo --gc --minify -b $DEPLOY_PRIME_URL"
 
 [context.branch-deploy.environment]
-HUGO_VERSION = "0.111.2"
+HUGO_VERSION = "0.115.2"
 
 [context.next.environment]
 HUGO_ENABLEGITINFO = "true"
diff --git a/...leSite/resources/_gen/assets/sass/sass/main.sass_ae9eb86df8175869edaecf50caadd93b.content b/...leSite/resources/_gen/assets/sass/sass/main.sass_ae9eb86df8175869edaecf50caadd93b.content
diff --git a/exampleSite/resources/_gen/assets/sass/sass/main.sass_ae9eb86df8175869edaecf50caadd93b.json b/exampleSite/resources/_gen/assets/sass/sass/main.sass_ae9eb86df8175869edaecf50caadd93b.json
@@ -1 +1 @@
-{"Target":"css/styles.67657b69c2ad5534c32b28f572591ea57dbeb96033736610b69bed940f8efacabbb6a834dcd5ec45cc07f6e60abe96df523378b23ebdd15ac5ec4c8f21fbadfd.css","MediaType":"text/css","Data":{"Integrity":"sha512-Z2V7acKtVTTDKyj1clkepX2+uWAzc2YQtpvtlA+O+sq7tqg03NXsRcwH9uYKvpbfUjN4sj690VrF7EyPIfut/Q=="}}
+{"Target":"css/styles.7c338b3650604ab08087be5f37f7007bb3d844978b2a7d14cc1a8e6c54eebbdde0420263e7269856f8d8d55432177de6a1d0329aad61b94be20dab481e8d06fe.css","MediaType":"text/css","Data":{"Integrity":"sha512-fDOLNlBgSrCAh75fN/cAe7PYRJeLKn0UzBqObFTuu93gQgJj5yaYVvjY1VQyF33modAymq1huUviDatIHo0G/g=="}}
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -11,55 +11,35 @@
   <header class="nav_header">
     {{- partial "nav" . }}
   </header>
-  {{ if or (eq .Section site.Params.blogDir) (eq .Type "search" ) }}
+  {{ if or (eq .Section $config.blogDir) (eq .Type "search" ) }}
     {{- block "main" . }}{{ end }}
   {{ else }}
   <div class="main wrap pt-4">
-    {{ $docSections := site.Params.docSections }}
+    {{ $docSections := $config.docSections }}
     {{- with $docSections }}{{- else }}
       {{- $docSections = "docs" }}
     {{- end }}
     {{ $uniqueHomepage := .IsHome }}
-    {{ if site.Params.uniqueHomepage }}
+    {{ if $config.uniqueHomepage }}
       {{ if .IsHome }}
         {{ $uniqueHomepage = true }}
       {{ end }}
-  <head>
-    {{- partial "head" . }}
-  </head>
-  <body class="page-{{ .Kind }}" id="pagetop">
-    <header class="nav_header">
-      {{- partial "nav" . }}
-    </header>
-    {{ if or (eq .Section site.Params.blogDir) (eq .Type "search" ) }}
-      {{- block "main" . }}{{ end }}
     {{ else }}
-    <div class="main wrap pt-4">
-      {{ $docSections := site.Params.docSections }}
-      {{- with $docSections }}{{- else }}
-        {{- $docSections = "docs" }}
-      {{- end }}
-      {{ $uniqueHomepage := .IsHome }}
-      {{ if site.Params.uniqueHomepage }}
-        {{ if .IsHome }}
-          {{ $uniqueHomepage = true }}
-        {{ end }}
-      {{ else }}
-        {{ $uniqueHomepage = false }}
-      {{ end }}
-      {{- if and (in $docSections .Section) (ne $uniqueHomepage true) }}
-        {{- partial "document" . }}
-      {{- else }}
-        <div class="content">
-          {{- block "main" . }}{{ end }}
-        </div>
-      {{- end -}}
-    </div>
+      {{ $uniqueHomepage = false }}
     {{ end }}
-    {{- partial "scripts/translations" . -}}
-    {{- partialCached "footer" . -}}
-    {{- partialCached "sprites" . -}}
-    {{- partial "scripts/bundle" . -}}
-    {{- partial "scripts/mermaid" . -}}
-  </body>
-</html>
+    {{- if and (in $docSections .Section) (ne $uniqueHomepage true) }}
+      {{- partial "document" . }}
+    {{- else }}
+      <div class="content">
+        {{- block "main" . }}{{ end }}
+      </div>
+    {{- end -}}
+  </div>
+  {{ end }}
+  {{- partial "scripts/translations" . -}}
+  {{- partialCached "footer" . -}}
+  {{- partialCached "sprites" . -}}
+  {{- partial "scripts/bundle" . -}}
+  {{- partial "scripts/mermaid" . -}}
+</body>
+</html>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"Target":"css/styles.67657b69c2ad5534c32b28f572591ea57dbeb96033736610b69bed940f8efacabbb6a834dcd5ec45cc07f6e60abe96df523378b23ebdd15ac5ec4c8f21fbadfd.css","MediaType":"text/css","Data":{"Integrity":"sha512-Z2V7acKtVTTDKyj1clkepX2+uWAzc2YQtpvtlA+O+sq7tqg03NXsRcwH9uYKvpbfUjN4sj690VrF7EyPIfut/Q=="}}
		{"Target":"css/styles.7c338b3650604ab08087be5f37f7007bb3d844978b2a7d14cc1a8e6c54eebbdde0420263e7269856f8d8d55432177de6a1d0329aad61b94be20dab481e8d06fe.css","MediaType":"text/css","Data":{"Integrity":"sha512-fDOLNlBgSrCAh75fN/cAe7PYRJeLKn0UzBqObFTuu93gQgJj5yaYVvjY1VQyF33modAymq1huUviDatIHo0G/g=="}}