diff --git a/assets/sass/_theme/sections/persons.sass b/assets/sass/_theme/sections/persons.sass index d8cc8d7f09589fb2cea2bead0819aabba037d927..47d27967da6725bd5384a5302ca88612a44ad859 100644 --- a/assets/sass/_theme/sections/persons.sass +++ b/assets/sass/_theme/sections/persons.sass @@ -25,7 +25,8 @@ margin-bottom: 0 -.persons +section.persons, +div.persons @include grid(1) @include grid(2, md) @include grid(3, lg) @@ -33,6 +34,27 @@ @include grid(5, xxl) +ol.persons + @include list-reset + > li + border-bottom: 1px solid $main-border-color + padding-bottom: $spacing1 + padding-top: $spacing1 + position: relative + p + margin-bottom: 0 + a + @include stretched-link + + @include media-breakpoint-up(md) + align-items: baseline + display: flex + > p + width: col(5) + & + p + width: col(7) + + .avatar @include aspect-ratio(50, 50, 'img') background-color: $persons-avatar-background-color diff --git a/assets/sass/_theme/sections/programs.sass b/assets/sass/_theme/sections/programs.sass index a0d8dbc943cd647754fdf644faf0ef383caaef7c..343b0a1d155e09b1f34d41ad7e4829c35e6eba8e 100644 --- a/assets/sass/_theme/sections/programs.sass +++ b/assets/sass/_theme/sections/programs.sass @@ -50,6 +50,7 @@ .program @include widget +div.programs, section.programs @include grid(2, md) @include grid(3, xl) diff --git a/layouts/partials/persons/list-specific.html b/layouts/partials/persons/list-specific.html index 6bcba593b7f64c0ead3a1fc4965855e96156636a..65a16fe4b23b134a81cf8086a2b963ac61ad395a 100644 --- a/layouts/partials/persons/list-specific.html +++ b/layouts/partials/persons/list-specific.html @@ -1,11 +1,14 @@ -<div class="persons"> +<ol class="persons"> {{ range (.Paginate (.Pages.ByParam "last_name")).Pages }} {{ $person := site.GetPage (printf "/persons/%s" .Slug) }} - {{ if $person }} - <div> - {{ partial "persons/person.html" $person }} - </div> + {{ with $person }} + <li> + <p class="name"><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></p> + {{- if partial "GetTextFromHTML" .Params.description_short }} + <p>{{- partial "PrepareHTML" .Params.description_short -}}</p> + {{ end -}} + </li> {{ end }} {{ end }} -</div> +</ol> {{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/persons/list.html b/layouts/partials/persons/list.html index 6ac115b1d2186d71b31f5a1e664f25dd7b1ab9c0..967bcc45c5808a62ab43acdbb075dd22a21e76ef 100644 --- a/layouts/partials/persons/list.html +++ b/layouts/partials/persons/list.html @@ -1,9 +1,12 @@ -<div class="persons"> +<ol class="persons"> {{ $persons := .Pages.ByParam "last_name" }} {{ range (.Paginate $persons).Pages }} - <div> - {{ partial "persons/person.html" . }} - </div> + <li> + <p class="name"><a href="{{ .Permalink }}">{{ partial "PrepareHTML" .Title }}</a></p> + {{- if partial "GetTextFromHTML" .Params.description_short }} + <p>{{- partial "PrepareHTML" .Params.description_short -}}</p> + {{ end -}} + </li> {{ end }} -</div> +</ol> {{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/persons/persons-specific.html b/layouts/partials/persons/persons-specific.html new file mode 100644 index 0000000000000000000000000000000000000000..6bcba593b7f64c0ead3a1fc4965855e96156636a --- /dev/null +++ b/layouts/partials/persons/persons-specific.html @@ -0,0 +1,11 @@ +<div class="persons"> + {{ range (.Paginate (.Pages.ByParam "last_name")).Pages }} + {{ $person := site.GetPage (printf "/persons/%s" .Slug) }} + {{ if $person }} + <div> + {{ partial "persons/person.html" $person }} + </div> + {{ end }} + {{ end }} +</div> +{{ partial "commons/pagination.html" . }} diff --git a/layouts/partials/persons/persons.html b/layouts/partials/persons/persons.html new file mode 100644 index 0000000000000000000000000000000000000000..6ac115b1d2186d71b31f5a1e664f25dd7b1ab9c0 --- /dev/null +++ b/layouts/partials/persons/persons.html @@ -0,0 +1,9 @@ +<div class="persons"> + {{ $persons := .Pages.ByParam "last_name" }} + {{ range (.Paginate $persons).Pages }} + <div> + {{ partial "persons/person.html" . }} + </div> + {{ end }} +</div> +{{ partial "commons/pagination.html" . }}