diff options
author | Alexander Neonxp Kiryukhin <i@neonxp.ru> | 2024-11-18 23:18:18 +0300 |
---|---|---|
committer | Alexander Neonxp Kiryukhin <i@neonxp.ru> | 2024-11-18 23:18:18 +0300 |
commit | 74b65dd83f7c66d1f67f961b1fee65400b1fc334 (patch) | |
tree | dd9d5f0db2dbc733bcbbb04f98f0d18abf40031e | |
parent | 1c1ae0094244868c63bd875c0cbfa50ced37de8d (diff) |
Фикс темы под мобильные устройства
-rw-r--r-- | content/_index.md | 4 | ||||
-rw-r--r-- | hugo.toml | 2 | ||||
-rw-r--r-- | themes/neonxp/assets/css/flexboxgrid.min.css | 1 | ||||
-rw-r--r-- | themes/neonxp/assets/css/main.css | 39 | ||||
-rw-r--r-- | themes/neonxp/layouts/_default/home.html | 29 | ||||
-rw-r--r-- | themes/neonxp/layouts/_default/list.html | 9 | ||||
-rw-r--r-- | themes/neonxp/layouts/_default/single.html | 52 | ||||
-rw-r--r-- | themes/neonxp/layouts/index.html | 30 | ||||
-rw-r--r-- | themes/neonxp/layouts/partials/comments.html | 2 | ||||
-rw-r--r-- | themes/neonxp/layouts/partials/footer.html | 15 | ||||
-rw-r--r-- | themes/neonxp/layouts/partials/head.html | 2 | ||||
-rw-r--r-- | themes/neonxp/layouts/partials/head/css.html | 9 | ||||
-rw-r--r-- | themes/neonxp/layouts/partials/list.html | 2 | ||||
-rw-r--r-- | themes/neonxp/layouts/partials/menu.html | 12 |
14 files changed, 101 insertions, 107 deletions
diff --git a/content/_index.md b/content/_index.md index 47c4b5b..38fa319 100644 --- a/content/_index.md +++ b/content/_index.md @@ -1,6 +1,6 @@ +++ -title = '~/NeonXP.log' +title = 'Привет!' +++ Добро пожаловать на мой личный сервер. Да, это старая добрая домашняя страница, персональный сайт, «хомяк», называйте как привычнее. <!--more--> -Меня зовут Саня, я Go разработчик. Остальное обо мне на [отдельной странице](/pages/me). А ниже [мой бортжурнал](/posts/).
\ No newline at end of file +Меня зовут Саня, я Go разработчик. Остальное обо мне на [отдельной странице](/pages/me). А рядом — [мой бортжурнал](/posts/).
\ No newline at end of file @@ -15,7 +15,7 @@ enabled = true enabled = true [params.dateFormat] -published = "02.01.2006" +published = "Monday, 02 January 2006" lastUpdated = "15:04 02.01.2006" [params.comments] diff --git a/themes/neonxp/assets/css/flexboxgrid.min.css b/themes/neonxp/assets/css/flexboxgrid.min.css new file mode 100644 index 0000000..2f502c9 --- /dev/null +++ b/themes/neonxp/assets/css/flexboxgrid.min.css @@ -0,0 +1 @@ +.container,.container-fluid{margin-right:auto;margin-left:auto}.container-fluid{padding-right:2rem;padding-left:2rem}.row{box-sizing:border-box;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-flex:0;-ms-flex:0 1 auto;flex:0 1 auto;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-.5rem;margin-left:-.5rem}.row.reverse{-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-ms-flex-direction:row-reverse;flex-direction:row-reverse}.col.reverse{-webkit-box-orient:vertical;-webkit-box-direction:reverse;-ms-flex-direction:column-reverse;flex-direction:column-reverse}.col-xs,.col-xs-1,.col-xs-10,.col-xs-11,.col-xs-12,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-offset-0,.col-xs-offset-1,.col-xs-offset-10,.col-xs-offset-11,.col-xs-offset-12,.col-xs-offset-2,.col-xs-offset-3,.col-xs-offset-4,.col-xs-offset-5,.col-xs-offset-6,.col-xs-offset-7,.col-xs-offset-8,.col-xs-offset-9{box-sizing:border-box;-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;padding-right:.5rem;padding-left:.5rem}.col-xs{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-preferred-size:0;flex-basis:0;max-width:100%}.col-xs-1{-ms-flex-preferred-size:8.33333333%;flex-basis:8.33333333%;max-width:8.33333333%}.col-xs-2{-ms-flex-preferred-size:16.66666667%;flex-basis:16.66666667%;max-width:16.66666667%}.col-xs-3{-ms-flex-preferred-size:25%;flex-basis:25%;max-width:25%}.col-xs-4{-ms-flex-preferred-size:33.33333333%;flex-basis:33.33333333%;max-width:33.33333333%}.col-xs-5{-ms-flex-preferred-size:41.66666667%;flex-basis:41.66666667%;max-width:41.66666667%}.col-xs-6{-ms-flex-preferred-size:50%;flex-basis:50%;max-width:50%}.col-xs-7{-ms-flex-preferred-size:58.33333333%;flex-basis:58.33333333%;max-width:58.33333333%}.col-xs-8{-ms-flex-preferred-size:66.66666667%;flex-basis:66.66666667%;max-width:66.66666667%}.col-xs-9{-ms-flex-preferred-size:75%;flex-basis:75%;max-width:75%}.col-xs-10{-ms-flex-preferred-size:83.33333333%;flex-basis:83.33333333%;max-width:83.33333333%}.col-xs-11{-ms-flex-preferred-size:91.66666667%;flex-basis:91.66666667%;max-width:91.66666667%}.col-xs-12{-ms-flex-preferred-size:100%;flex-basis:100%;max-width:100%}.col-xs-offset-0{margin-left:0}.col-xs-offset-1{margin-left:8.33333333%}.col-xs-offset-2{margin-left:16.66666667%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-4{margin-left:33.33333333%}.col-xs-offset-5{margin-left:41.66666667%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-7{margin-left:58.33333333%}.col-xs-offset-8{margin-left:66.66666667%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-10{margin-left:83.33333333%}.col-xs-offset-11{margin-left:91.66666667%}.start-xs{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:start}.center-xs{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;text-align:center}.end-xs{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;text-align:end}.top-xs{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.middle-xs{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bottom-xs{-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}.around-xs{-ms-flex-pack:distribute;justify-content:space-around}.between-xs{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.first-xs{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.last-xs{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}@media only screen and (min-width:48em){.container{width:49rem}.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-offset-0,.col-sm-offset-1,.col-sm-offset-10,.col-sm-offset-11,.col-sm-offset-12,.col-sm-offset-2,.col-sm-offset-3,.col-sm-offset-4,.col-sm-offset-5,.col-sm-offset-6,.col-sm-offset-7,.col-sm-offset-8,.col-sm-offset-9{box-sizing:border-box;-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;padding-right:.5rem;padding-left:.5rem}.col-sm{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-preferred-size:0;flex-basis:0;max-width:100%}.col-sm-1{-ms-flex-preferred-size:8.33333333%;flex-basis:8.33333333%;max-width:8.33333333%}.col-sm-2{-ms-flex-preferred-size:16.66666667%;flex-basis:16.66666667%;max-width:16.66666667%}.col-sm-3{-ms-flex-preferred-size:25%;flex-basis:25%;max-width:25%}.col-sm-4{-ms-flex-preferred-size:33.33333333%;flex-basis:33.33333333%;max-width:33.33333333%}.col-sm-5{-ms-flex-preferred-size:41.66666667%;flex-basis:41.66666667%;max-width:41.66666667%}.col-sm-6{-ms-flex-preferred-size:50%;flex-basis:50%;max-width:50%}.col-sm-7{-ms-flex-preferred-size:58.33333333%;flex-basis:58.33333333%;max-width:58.33333333%}.col-sm-8{-ms-flex-preferred-size:66.66666667%;flex-basis:66.66666667%;max-width:66.66666667%}.col-sm-9{-ms-flex-preferred-size:75%;flex-basis:75%;max-width:75%}.col-sm-10{-ms-flex-preferred-size:83.33333333%;flex-basis:83.33333333%;max-width:83.33333333%}.col-sm-11{-ms-flex-preferred-size:91.66666667%;flex-basis:91.66666667%;max-width:91.66666667%}.col-sm-12{-ms-flex-preferred-size:100%;flex-basis:100%;max-width:100%}.col-sm-offset-0{margin-left:0}.col-sm-offset-1{margin-left:8.33333333%}.col-sm-offset-2{margin-left:16.66666667%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333333%}.col-sm-offset-5{margin-left:41.66666667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.33333333%}.col-sm-offset-8{margin-left:66.66666667%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333333%}.col-sm-offset-11{margin-left:91.66666667%}.start-sm{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:start}.center-sm{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;text-align:center}.end-sm{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;text-align:end}.top-sm{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.middle-sm{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bottom-sm{-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}.around-sm{-ms-flex-pack:distribute;justify-content:space-around}.between-sm{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.first-sm{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.last-sm{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}}@media only screen and (min-width:64em){.container{width:65rem}.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-offset-0,.col-md-offset-1,.col-md-offset-10,.col-md-offset-11,.col-md-offset-12,.col-md-offset-2,.col-md-offset-3,.col-md-offset-4,.col-md-offset-5,.col-md-offset-6,.col-md-offset-7,.col-md-offset-8,.col-md-offset-9{box-sizing:border-box;-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;padding-right:.5rem;padding-left:.5rem}.col-md{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-preferred-size:0;flex-basis:0;max-width:100%}.col-md-1{-ms-flex-preferred-size:8.33333333%;flex-basis:8.33333333%;max-width:8.33333333%}.col-md-2{-ms-flex-preferred-size:16.66666667%;flex-basis:16.66666667%;max-width:16.66666667%}.col-md-3{-ms-flex-preferred-size:25%;flex-basis:25%;max-width:25%}.col-md-4{-ms-flex-preferred-size:33.33333333%;flex-basis:33.33333333%;max-width:33.33333333%}.col-md-5{-ms-flex-preferred-size:41.66666667%;flex-basis:41.66666667%;max-width:41.66666667%}.col-md-6{-ms-flex-preferred-size:50%;flex-basis:50%;max-width:50%}.col-md-7{-ms-flex-preferred-size:58.33333333%;flex-basis:58.33333333%;max-width:58.33333333%}.col-md-8{-ms-flex-preferred-size:66.66666667%;flex-basis:66.66666667%;max-width:66.66666667%}.col-md-9{-ms-flex-preferred-size:75%;flex-basis:75%;max-width:75%}.col-md-10{-ms-flex-preferred-size:83.33333333%;flex-basis:83.33333333%;max-width:83.33333333%}.col-md-11{-ms-flex-preferred-size:91.66666667%;flex-basis:91.66666667%;max-width:91.66666667%}.col-md-12{-ms-flex-preferred-size:100%;flex-basis:100%;max-width:100%}.col-md-offset-0{margin-left:0}.col-md-offset-1{margin-left:8.33333333%}.col-md-offset-2{margin-left:16.66666667%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333333%}.col-md-offset-5{margin-left:41.66666667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.33333333%}.col-md-offset-8{margin-left:66.66666667%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333333%}.col-md-offset-11{margin-left:91.66666667%}.start-md{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:start}.center-md{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;text-align:center}.end-md{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;text-align:end}.top-md{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.middle-md{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bottom-md{-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}.around-md{-ms-flex-pack:distribute;justify-content:space-around}.between-md{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.first-md{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.last-md{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}}@media only screen and (min-width:75em){.container{width:76rem}.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-offset-0,.col-lg-offset-1,.col-lg-offset-10,.col-lg-offset-11,.col-lg-offset-12,.col-lg-offset-2,.col-lg-offset-3,.col-lg-offset-4,.col-lg-offset-5,.col-lg-offset-6,.col-lg-offset-7,.col-lg-offset-8,.col-lg-offset-9{box-sizing:border-box;-webkit-box-flex:0;-ms-flex:0 0 auto;flex:0 0 auto;padding-right:.5rem;padding-left:.5rem}.col-lg{-webkit-box-flex:1;-ms-flex-positive:1;flex-grow:1;-ms-flex-preferred-size:0;flex-basis:0;max-width:100%}.col-lg-1{-ms-flex-preferred-size:8.33333333%;flex-basis:8.33333333%;max-width:8.33333333%}.col-lg-2{-ms-flex-preferred-size:16.66666667%;flex-basis:16.66666667%;max-width:16.66666667%}.col-lg-3{-ms-flex-preferred-size:25%;flex-basis:25%;max-width:25%}.col-lg-4{-ms-flex-preferred-size:33.33333333%;flex-basis:33.33333333%;max-width:33.33333333%}.col-lg-5{-ms-flex-preferred-size:41.66666667%;flex-basis:41.66666667%;max-width:41.66666667%}.col-lg-6{-ms-flex-preferred-size:50%;flex-basis:50%;max-width:50%}.col-lg-7{-ms-flex-preferred-size:58.33333333%;flex-basis:58.33333333%;max-width:58.33333333%}.col-lg-8{-ms-flex-preferred-size:66.66666667%;flex-basis:66.66666667%;max-width:66.66666667%}.col-lg-9{-ms-flex-preferred-size:75%;flex-basis:75%;max-width:75%}.col-lg-10{-ms-flex-preferred-size:83.33333333%;flex-basis:83.33333333%;max-width:83.33333333%}.col-lg-11{-ms-flex-preferred-size:91.66666667%;flex-basis:91.66666667%;max-width:91.66666667%}.col-lg-12{-ms-flex-preferred-size:100%;flex-basis:100%;max-width:100%}.col-lg-offset-0{margin-left:0}.col-lg-offset-1{margin-left:8.33333333%}.col-lg-offset-2{margin-left:16.66666667%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333333%}.col-lg-offset-5{margin-left:41.66666667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.33333333%}.col-lg-offset-8{margin-left:66.66666667%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333333%}.col-lg-offset-11{margin-left:91.66666667%}.start-lg{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;text-align:start}.center-lg{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center;text-align:center}.end-lg{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;text-align:end}.top-lg{-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start}.middle-lg{-webkit-box-align:center;-ms-flex-align:center;align-items:center}.bottom-lg{-webkit-box-align:end;-ms-flex-align:end;align-items:flex-end}.around-lg{-ms-flex-pack:distribute;justify-content:space-around}.between-lg{-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.first-lg{-webkit-box-ordinal-group:0;-ms-flex-order:-1;order:-1}.last-lg{-webkit-box-ordinal-group:2;-ms-flex-order:1;order:1}}
\ No newline at end of file diff --git a/themes/neonxp/assets/css/main.css b/themes/neonxp/assets/css/main.css index 89ab654..23daadd 100644 --- a/themes/neonxp/assets/css/main.css +++ b/themes/neonxp/assets/css/main.css @@ -12,21 +12,36 @@ height: 64px; } -@media (min-width: 1030px) { - .single-page { - display: flex; - flex-direction: row; - gap: var(--pico-block-spacing-horizontal); - } +.print-footer { + display: none; +} + +@media print { .sidebar { - min-width: 300px; - height: auto; + display: none; + } + article { + border: 0 } - .sidebar .toc { - min-width: 300px; + article footer { + display: none; + } + .container>header { + display: none; + } + .container>footer { + display: none; + } + .comments { + display: none; } .h-entry { - width: 100%; - max-width: 1130px; + width: 100% !important; + } + .container { + width: 100% !important; + } + .print-footer { + display: block !important; } }
\ No newline at end of file diff --git a/themes/neonxp/layouts/_default/home.html b/themes/neonxp/layouts/_default/home.html index 0df6597..9d97e21 100644 --- a/themes/neonxp/layouts/_default/home.html +++ b/themes/neonxp/layouts/_default/home.html @@ -1,7 +1,26 @@ {{ define "main" }} - {{ .Content }} - {{ range site.RegularPages }} - <h2><a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a></h2> - {{ .Summary }} - {{ end }} +<div class="row"> + <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 last-xs last-sm first-md first-lg sidebar"> + <article> + <header>Навигатор</header> + {{ partial "menu.html" (dict "menuID" "sections" "page" .) }} + </article> + </div> + <div class="h-entry col-xs-12 col-sm-12 col-md-8 col-lg-8"> + <article> + <header class="p-name"> + {{ .Title }} + </header> + <div class="e-content"> + {{ .Content }} + </div> + </article> + {{ $pages := where site.RegularPages "Type" "posts" }} + {{ $paginator := .Paginate $pages 7 }} + {{ range $paginator.Pages }} + {{ partial "list.html" . }} + {{ end }} + <nav>{{ partial "pagination.html" . }}</nav> + </div> +</div> {{ end }} diff --git a/themes/neonxp/layouts/_default/list.html b/themes/neonxp/layouts/_default/list.html index 065ee1a..6a399e7 100644 --- a/themes/neonxp/layouts/_default/list.html +++ b/themes/neonxp/layouts/_default/list.html @@ -1,19 +1,18 @@ {{ define "main" }} -<div class="single-page"> - <div class="sidebar"> - <article class="toc"> +<div class="row"> + <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 last-xs last-sm first-md first-lg sidebar"> + <article> <header>Навигатор</header> {{ partial "menu.html" (dict "menuID" "sections" "page" .) }} </article> </div> - <div class="h-entry"> + <div class="h-entry col-xs-12 col-sm-12 col-md-8 col-lg-8"> {{ if .Title }} <article> <header>{{ .Title }}</header> {{ .Content }} </article> {{ end }} - <h1>Страницы:</h1> {{ $paginator := .Paginate .Pages 7 }} {{ range $paginator.Pages }} {{ partial "list.html" . }} diff --git a/themes/neonxp/layouts/_default/single.html b/themes/neonxp/layouts/_default/single.html index 8a7b707..1508d26 100644 --- a/themes/neonxp/layouts/_default/single.html +++ b/themes/neonxp/layouts/_default/single.html @@ -1,52 +1,38 @@ {{ define "main" }} -<div class="single-page"> - <div class="sidebar"> - <div class="toc"> +<div class="row"> + <div class="col-xs-12 col-sm-12 col-md-4 col-lg-4 last-xs last-sm first-md first-lg sidebar"> {{ if .Params.toc }} - <article> - <header>Содержание</header> - <aside>{{ .TableOfContents }}</aside> - </article> - {{ end }} <article> - <header>Разделы</header> - {{ partial "menu.html" (dict "menuID" "sections" "page" .) }} + <header>Содержание</header> + <aside>{{ .TableOfContents }}</aside> + </article> + {{ end }} + <article> + <header>Навигатор</header> + {{ partial "menu.html" (dict "menuID" "sections" "page" .) }} </article> - </div> </div> - <div class="h-entry"> + <div class="h-entry col-xs-12 col-sm-12 col-md-8 col-lg-8"> <article> <header class="space-between"> - <span class="p-name"> - {{ .Title }} - </span> + <span class="p-name"> {{ .Title }} </span> {{ if .Date }} - {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") }} - <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time> + {{ $dateMachine := .Date | time.Format "2006-01-02T15:04:05-07:00" }} + {{ $dateHuman := .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") }} + <time class="dt-published" datetime="{{ $dateMachine }}">{{ $dateHuman }}</time> {{ end }} </header> - <div class="p-summary"> - {{ .Summary }} - </div> - <div class="e-content"> - {{ .Content }} - </div> + <div class="p-summary">{{ .Summary }}</div> + <div class="e-content">{{ .Content }}</div> <footer class="space-between"> <span> - {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} + {{ partial "terms.html" (dict "taxonomy" "tags" "page" .) }} </span> <a class="u-url" href="{{ .Permalink }}">#</a> - - {{ if .Params.Location }} - <span class="p-location">@ {{.Params.Location}}</span> - {{ end }} - {{ if .Lastmod }} - {{ $dateMachine := .Lastmod | time.Format "2006-01-02T15:04:05-07:00" }} - {{ $dateHuman := .Lastmod | time.Format (or .Site.Params.dateFormat.lastUpdated "Jan 02, 2006") }} - <time class="dt-updated" datetime="{{ $dateMachine }}">Изм: {{ $dateHuman }}</time> + {{ if .Params.Location }} + <span class="p-location">@ {{.Params.Location}}</span> {{ end }} </footer> </article> diff --git a/themes/neonxp/layouts/index.html b/themes/neonxp/layouts/index.html deleted file mode 100644 index f92bc7f..0000000 --- a/themes/neonxp/layouts/index.html +++ /dev/null @@ -1,30 +0,0 @@ -{{ define "main" }} -<div class="single-page"> - <div class="sidebar"> - <article class="toc"> - <header>Навигатор</header> - {{ partial "menu.html" (dict "menuID" "sections" "page" .) }} - </article> - </div> - <div class="h-entry"> - <article> - <header class="p-name"> - {{ .Title }} - </header> - <div class="p-summary"> - {{ .Summary }} - </div> - <div class="e-content"> - {{ .Content }} - </div> - </article> - <h1>Блог</h1> - {{ $pages := where site.RegularPages "Type" "posts" }} - {{ $paginator := .Paginate $pages 7 }} - {{ range $paginator.Pages }} - {{ partial "list.html" . }} - {{ end }} - <nav>{{ partial "pagination.html" . }}</nav> - </div> -</div> -{{ end }} diff --git a/themes/neonxp/layouts/partials/comments.html b/themes/neonxp/layouts/partials/comments.html index c01c3b7..77b4410 100644 --- a/themes/neonxp/layouts/partials/comments.html +++ b/themes/neonxp/layouts/partials/comments.html @@ -1,5 +1,5 @@ {{- with .Site.Params.comments -}} -<article> +<article class="comments"> <header>Комментарии</header> <div id="remark42"></div> </article> diff --git a/themes/neonxp/layouts/partials/footer.html b/themes/neonxp/layouts/partials/footer.html index a68920c..f520850 100644 --- a/themes/neonxp/layouts/partials/footer.html +++ b/themes/neonxp/layouts/partials/footer.html @@ -1,19 +1,12 @@ <nav> <ul> <li> - <cite>2007—{{ now.Year }}</cite> - </li> - <li> - <cite> Александр NeonXP Кирюхин. </cite> - </li> - <li> - <cite>г.Казань</cite> + <cite>2007—{{ now.Year }} Александр NeonXP Кирюхин. г.Казань</cite> </li> </ul> - <ul> - <li><a href="https://git.neonxp.ru/neonxp/blog">Исходный код</a>.</li> - <li><a href="mailto:i@neonxp.ru" rel="me">Электропочта</a>.</li> - <li><a href="https://neonxp.ru/posts/index.xml">РСС</a>.</li> + <li><a href="https://git.neonxp.ru/neonxp/blog">Исходный код</a></li> + <li><a href="mailto:i@neonxp.ru" rel="me">Электропочта</a></li> + <li><a href="https://neonxp.ru/posts/index.xml">РСС</a></li> </ul> </nav> diff --git a/themes/neonxp/layouts/partials/head.html b/themes/neonxp/layouts/partials/head.html index 119b138..6731ae0 100644 --- a/themes/neonxp/layouts/partials/head.html +++ b/themes/neonxp/layouts/partials/head.html @@ -3,7 +3,7 @@ <link rel="icon" type="image/png" href="/favicon.png"> <link rel="authorization_endpoint" href="https://indieauth.com/auth"> <link rel="token_endpoint" href="https://tokens.indieauth.com/token"> -<link rel="micropub" href="https://eo7kjtzrfq0v1s2.m.pipedream.net/micropub"> +<link rel="micropub" href="https://neonxp.ru/micropub"> <title>{{ if .IsHome }}{{ site.Title }}{{ else }}{{ printf "%s | %s" .Title site.Title }}{{ end }}</title> {{ partialCached "head/css.html" . }} {{ partialCached "head/js.html" . }} diff --git a/themes/neonxp/layouts/partials/head/css.html b/themes/neonxp/layouts/partials/head/css.html index 09e7397..c0dc59e 100644 --- a/themes/neonxp/layouts/partials/head/css.html +++ b/themes/neonxp/layouts/partials/head/css.html @@ -7,6 +7,15 @@ {{- end }} {{- end }} {{- end }} +{{- with resources.Get "css/flexboxgrid.min.css" }} + {{- if eq hugo.Environment "development" }} + <link rel="stylesheet" href="{{ .RelPermalink }}"> + {{- else }} + {{- with . | minify | fingerprint }} + <link rel="stylesheet" href="{{ .RelPermalink }}" integrity="{{ .Data.Integrity }}" crossorigin="anonymous"> + {{- end }} + {{- end }} +{{- end }} {{- with resources.Get "css/syntax.css" }} {{- if eq hugo.Environment "development" }} <link rel="stylesheet" href="{{ .RelPermalink }}"> diff --git a/themes/neonxp/layouts/partials/list.html b/themes/neonxp/layouts/partials/list.html index 3b1bacc..72d546c 100644 --- a/themes/neonxp/layouts/partials/list.html +++ b/themes/neonxp/layouts/partials/list.html @@ -3,7 +3,7 @@ <a href="{{ .RelPermalink }}">{{ .LinkTitle }}</a> {{ if .Date }} <span> - {{- .Date | time.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") -}} + {{- .Date | time.Format (or .Site.Params.dateFormat.published "02 Jan 2006") -}} </span> {{ end }} </header> diff --git a/themes/neonxp/layouts/partials/menu.html b/themes/neonxp/layouts/partials/menu.html index 97f2e1f..c860b4c 100644 --- a/themes/neonxp/layouts/partials/menu.html +++ b/themes/neonxp/layouts/partials/menu.html @@ -12,9 +12,11 @@ Renders a menu for the given menu ID. {{- with index site.Menus $menuID }} <aside> - <ul> - {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }} - </ul> + <nav> + <ol> + {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }} + </ol> + </nav> </aside> {{- end }} @@ -42,9 +44,9 @@ Renders a menu for the given menu ID. {{- end -}} >{{ $name }}</a> {{- with .Children }} - <ul> + <ol> {{- partial "inline/menu/walk.html" (dict "page" $page "menuEntries" .) }} - </ul> + </ol> {{- end }} </li> {{- end }} |