Skip to content

Commit

Permalink
Merge pull request #721 from mpourismaiel/fix/global/hugo-0.68.3
Browse files Browse the repository at this point in the history
Update Hugo support and fix a few issues regarding Hugo changes
  • Loading branch information
stp-ip authored Mar 25, 2020
2 parents bfa6c84 + 566a4a9 commit b7f8492
Show file tree
Hide file tree
Showing 64 changed files with 34 additions and 33 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title = "Third Title"
subtitle = "Lorem ipsum dolor sit amet, consectetur adipiscing"

[asset]
image = "dog-1.jpeg"
icon = "fab fa-github"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 40

[asset]
image = "dog-2.jpeg"
image = "dog-1.jpeg"

[[labels]]
title = "Animal"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
weight = 50

[asset]
image = "dog-3.jpeg"
image = "dog-2.jpeg"
+++

Ante in nibh mauris cursus mattis molestie a iaculis. Nisi porta lorem mollis aliquam. Eu consequat ac felis donec et odio pellentesque diam volutpat. Arcu dui vivamus arcu felis. Senectus et netus et malesuada fames ac turpis egestas sed. Orci eu lobortis elementum nibh.
5 changes: 3 additions & 2 deletions exampleSite/content/fragments/contact/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@ Contributions for translations are welcome.
### Events

<!-- TODO: revise later -->
This fragment uses the [Events]({{< ref "events" >}}) api by default.
This fragment uses the [Events]({{< ref "docs/events" >}}) api by default.

#### Subscribers

##### contact:update

This event is not published by any fragment by default. But you can make use of it through [event urls]({{< ref "events" >}}#event-urls).
This event is not published by any fragment by default. But you can make use of
it through [event urls]({{< ref "docs/events" >}}#event-urls).

###### name
*type: string*
Expand Down
4 changes: 2 additions & 2 deletions exampleSite/content/fragments/stripe/docs.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ The use of a backend is also useful for saving other information from the user s

### Events

This fragment uses the [Events]({{< ref "events" >}}) api by default.
This fragment uses the [Events]({{< ref "docs/events" >}}) api by default.

#### Subscribers

##### pricing:change

This event is published by the [Pricing fragment]({{< ref "pricing" >}}#events). It can also be published by [event urls]({{< ref "events" >}}#event-urls).
This event is published by the [Pricing fragment]({{< ref "pricing" >}}#events). It can also be published by [event urls]({{< ref "docs/events" >}}#event-urls).

###### product
*type: string*
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Target":"style.min.025e3d92429b7665b1a142b340c3061c0e12b50b42696e498c2346b5393b4efb.css","MediaType":"text/css","Data":{"Integrity":"sha256-Al49kkKbdmWxoUKzQMMGHA4StQtCaW5JjCNGtTk7Tvs="}}
{"Target":"style.min.5be84a29588be25ce368c2c2286616c722690b5d9d22c6344ec304c1e8178eb9.css","MediaType":"text/css","Data":{"Integrity":"sha256-W+hKKViL4lzjaMLCKGYWxyJpC12dIsY0TsMEwegXjrk="}}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions layouts/partials/fragments/nav.html
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
{{- $page_scratch.Set "crumb_tmp" $.page -}}
{{- else if ge $index 1 -}}
{{- $directory := (delimit (first (add $index 1) $sections) "/") -}}
{{- $page_scratch.Set "crumb_tmp" ($.root.Site.GetPage "page" (print $directory)) -}}
{{- $page_scratch.Set "crumb_tmp" ($.root.Site.GetPage "page" (print (strings.TrimPrefix "/" $directory))) -}}
{{- else -}}
{{- $page_scratch.Set "crumb_tmp" ($.root.Site.GetPage "section" (print $directory)) -}}
{{- $page_scratch.Set "crumb_tmp" ($.root.Site.GetPage "section" (print (strings.TrimPrefix "/" $directory))) -}}
{{- end -}}
{{- if ($page_scratch.Get "crumb_tmp") -}}
{{- $page_scratch.Add "crumbs" ($page_scratch.Get "crumb_tmp") -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/helpers/fragments.html
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
{{- else if ge $index 1 -}}
{{/* Sections between the first and last are found and their _global directories
are taken into account */}}
{{- $directory := (delimit (first (add $index 1) ($page_scratch.Get "sections")) "/") -}}
{{- $directory := strings.TrimPrefix "/" (delimit (first (add $index 1) ($page_scratch.Get "sections")) "/") -}}
{{- $page := printf "%s/%s" $directory "_global" -}}
{{- $page_scratch.Set "active_page_default" ($default_site.GetPage "page" $page) -}}
{{- $page_scratch.Set "active_page" ($real_page.Site.GetPage "page" $page) -}}
Expand Down

0 comments on commit b7f8492

Please sign in to comment.