diff --git a/modules/wowchemy/assets/scss/wowchemy/widgets/_about.scss b/modules/wowchemy/assets/scss/wowchemy/widgets/_about.scss index 52ff93a7..3f75c098 100644 --- a/modules/wowchemy/assets/scss/wowchemy/widgets/_about.scss +++ b/modules/wowchemy/assets/scss/wowchemy/widgets/_about.scss @@ -129,3 +129,43 @@ ul.ul-edu li .description p.institution { background-color: #000; box-shadow: 0 10px 20px rgba(0, 0, 0, 0.04), 0 2px 6px rgba(0, 0, 0, 0.04), 0 0 1px rgba(255, 255, 255, 0.96); } + +// ABOUT.AVATAR BLOCK STYLE (overrides ABOUT block styles) +.wg-about-avatar { + // Custom avatar size on homepage + .avatar { + width: auto; + height: auto; + max-width: 225px; + max-height: 225px; + } + + #profile .network-icon { + margin-top: 0.5rem; + } + + ul.network-icon .big-icon { + font-size: 1.5rem; + } + + .network-icon li { + @include media-breakpoint-down(sm) { + /* Min 48px Lighthouse tap targets on mobile */ + margin-right: 12px; + } + } + + .dark .portrait-title h3 { + color: rgba(255, 255, 255, 0.9); + font-weight: bold; + } + + .dark .portrait-title h2 { + color: #fff; + font-weight: bold; + } + + .bio-text { + max-width: 680px; + } +} diff --git a/modules/wowchemy/layouts/partials/blocks/about.avatar.html b/modules/wowchemy/layouts/partials/blocks/about.avatar.html index c72010a3..f43c3228 100644 --- a/modules/wowchemy/layouts/partials/blocks/about.avatar.html +++ b/modules/wowchemy/layouts/partials/blocks/about.avatar.html @@ -82,9 +82,11 @@ {{ end }} - {{ with $block.Content | default ($block.content.text | emojify | markdownify) }} -
- {{ . }} + {{ with ($block.content.text | emojify | markdownify) | default $person_page.Content }} +
+
+ {{ . }} +
{{ end }} diff --git a/modules/wowchemy/layouts/partials/blocks/collection.html b/modules/wowchemy/layouts/partials/blocks/collection.html index 519d34c8..80b4bbb7 100644 --- a/modules/wowchemy/layouts/partials/blocks/collection.html +++ b/modules/wowchemy/layouts/partials/blocks/collection.html @@ -78,7 +78,7 @@
- {{ with $block.content.text }}{{ . }}{{ end }} + {{ with $block.content.text }}{{ . | emojify | markdownify }}{{ end }} {{ range $index, $item := $query }} {{ partial "functions/render_view" (dict "page" $block "item" . "view" ($block.design.view | default "compact") "index" $index) }} diff --git a/modules/wowchemy/layouts/partials/blocks/experience.html b/modules/wowchemy/layouts/partials/blocks/experience.html new file mode 100644 index 00000000..ae01fce0 --- /dev/null +++ b/modules/wowchemy/layouts/partials/blocks/experience.html @@ -0,0 +1,80 @@ +{{/* Wowchemy Blocks: Experience */}} +{{/* Documentation: https://wowchemy.com/blocks/ */}} +{{/* License: https://github.com/wowchemy/wowchemy-hugo-themes/blob/main/LICENSE.md */}} + +{{/* Initialise */}} +{{ $page := .wcPage }} +{{ $block := .wcBlock }} +{{ $columns := $block.design.columns | default "1" }} + + +
+ {{ with $block.content.text }}{{ . | emojify | markdownify }}{{ end }} + + {{ if $block.content.items }} + {{ $exp_len := len $block.content.items }} + + {{/* Default to user's custom order (as requested in #1761) as Hugo doesn't support multiple sorts on params. */}} + {{ range $idx, $key := $block.content.items }} +
+ +
+
+
 
+
 
+
+
+   +
+
+
 
+
 
+
+
+ +
+
+
+ + {{- if .company_logo}} + {{- $svg_icon := resources.Get (printf "media/icons/brands/%s.svg" .company_logo) -}} + {{ if not $svg_icon }}{{ errorf "Brand logo not found at `assets/media/icons/brands/%s.svg`" .company_logo }}{{end}} +
+
+ {{- with .company_url}}{{end -}} + {{.company | plainify}} + {{- with .company_url}}{{end -}} +
+
+ {{ end }} + +
{{.title | markdownify | emojify}}
+
+ {{- with .company_url}}{{end}}{{.company | markdownify | emojify}}{{with .company_url}}{{end -}} +
+
+ {{ (time .date_start) | time.Format ($block.Params.date_format | default "January 2006") }} – + {{ if .date_end}} + {{ (time .date_end) | time.Format ($block.Params.date_format | default "January 2006") }} + {{else}} + {{ i18n "present" | default "Present" }} + {{end}} + {{with .location}} + + {{.}} + {{end}} +
+ + {{- if .company_logo}} +
+
+ {{end}} + + {{with .description}}
{{. | markdownify | emojify}}
{{end}} +
+
+
+
+ {{end}} + {{end}} +
diff --git a/modules/wowchemy/layouts/partials/blocks/markdown.html b/modules/wowchemy/layouts/partials/blocks/markdown.html index 36dc506e..7ae6708f 100644 --- a/modules/wowchemy/layouts/partials/blocks/markdown.html +++ b/modules/wowchemy/layouts/partials/blocks/markdown.html @@ -5,7 +5,7 @@ {{/* Initialise */}} {{ $page := .wcPage }} {{ $block := .wcBlock }} -{{ $columns := $block.design.columns | default "2" }} +{{ $columns := $block.design.columns | default "1" }} {{ $text := $block.content.text | emojify | markdownify }} {{ if ne $columns "1" }} diff --git a/modules/wowchemy/layouts/partials/blocks/tag_cloud.html b/modules/wowchemy/layouts/partials/blocks/tag_cloud.html index 38349539..dd43a334 100644 --- a/modules/wowchemy/layouts/partials/blocks/tag_cloud.html +++ b/modules/wowchemy/layouts/partials/blocks/tag_cloud.html @@ -20,7 +20,7 @@ {{ $tags := first $items_count (index site.Taxonomies $taxonomy).ByCount }} {{ $count := len $tags }} -{{ $columns := $block.design.columns | default "2" }} +{{ $columns := $block.design.columns | default "1" }}
{{ with $block.content.text }}{{ . | markdownify }}{{ end }} diff --git a/modules/wowchemy/layouts/partials/functions/parse_block_v2.html b/modules/wowchemy/layouts/partials/functions/parse_block_v2.html index 33958992..8926ef38 100644 --- a/modules/wowchemy/layouts/partials/functions/parse_block_v2.html +++ b/modules/wowchemy/layouts/partials/functions/parse_block_v2.html @@ -81,7 +81,7 @@ {{ end }} {{/* Fix Hugo's ContentBaseName returning wrong file base name when page section is within a bundle. */}} -{{ $hash_id := $block.id | default (printf "section-%s" $block.block) }} +{{ $hash_id := $block.id | default (printf "section-%s" (replace $block_type "." "-")) }} {{ $widget_args := dict "wcPage" $page "wcBlock" $block "wcIdentifier" $hash_id }} {{ $css_classes := $block.design.css_class | default $block.Params.advanced.css_class | default "" }} diff --git a/modules/wowchemy/layouts/partials/views/showcase.html b/modules/wowchemy/layouts/partials/views/showcase.html index 92534b84..597bbe4c 100644 --- a/modules/wowchemy/layouts/partials/views/showcase.html +++ b/modules/wowchemy/layouts/partials/views/showcase.html @@ -23,7 +23,11 @@ {{ end }} {{ $order := "" }} -{{ if and ($widget.Params.design.flip_alt_rows | default true) (not (modBool $index 2)) }} +{{ if isset $widget "Params" }} + {{ if and ($widget.Params.design.flip_alt_rows | default true) (not (modBool $index 2)) }} + {{ $order = "order-md-2" }} + {{ end }} +{{ else if and ($widget.design.flip_alt_rows | default true) (not (modBool $index 2)) }} {{ $order = "order-md-2" }} {{ end }}