diff options
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/baseof.html | 15 | ||||
| -rw-r--r-- | layouts/_default/section.html (renamed from layouts/_default/summary.html) | 0 | ||||
| -rw-r--r-- | layouts/_default/single.html | 4 | ||||
| -rw-r--r-- | layouts/partials/footer.html | 2 | ||||
| -rw-r--r-- | layouts/partials/header.html | 86 | ||||
| -rw-r--r-- | layouts/partials/post-footer.html | 2 | ||||
| -rw-r--r-- | layouts/partials/post-header.html | 4 | ||||
| -rw-r--r-- | layouts/partials/script.html | 2 |
8 files changed, 60 insertions, 55 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 801085b..debecc2 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -1,11 +1,12 @@ <!DOCTYPE html> <html> - {{- partial "head.html" . -}} - <body> - {{- block "header" .}}{{- end }} - <div id="content"> + {{- partial "head.html" . -}} + <body> + {{- block "header" .}}{{- end }} + <div id="content"> {{- block "main" . }}{{- end }} - </div> - {{- block "footer" . }}{{- end}} - </body> + </div> + {{- block "footer" . }}{{- end}} + {{ partial "script.html" . }} + </body> </html> diff --git a/layouts/_default/summary.html b/layouts/_default/section.html index e69de29..e69de29 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/section.html diff --git a/layouts/_default/single.html b/layouts/_default/single.html index feb6d18..7e9b8c4 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -3,7 +3,11 @@ {{end}} {{define "main"}} <article class="post"> + {{if .Content}} <div class="post-content">{{.Content}}</div> + {{else}} + <div class="post-content--nopost">Author leaves no content for this post :( </div> + {{end}} </article> {{ partial "button" . }} {{end}} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index bf0236f..699b90d 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -6,5 +6,3 @@ <div class="footer__socials">{{partial "social.html" .}}</div> </div> </footer> -{{$script := resources.Get "js/script.js"}} -<script src="{{$script.Permalink}}"></script> diff --git a/layouts/partials/header.html b/layouts/partials/header.html index abf9f44..5f3eec6 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,46 +1,46 @@ <header> - <div class="header header-frame"> - <div> - <div class="header__title">{{.Site.Title}}</div> - {{if .Site.Params.Description}} - <div class="header__description">{{.Site.Params.Description}}</div> - {{end}} - </div> - <nav class="header-nav"> - <ul class="header-nav-list header-nav-list--menu"> - {{ $currentPage := . }} - {{ range .Site.Menus.main }} - {{ if .HasChildren }} - <li class="header-nav-list__item {{ if $currentPage.HasMenuCurrent "main" . }}active{{ end }}"> - <a class="header-nav-list__link" href="#"> - {{ .Pre }} - <span>{{ .Name }}</span> - </a> - </li> - <ul class="header-nav-list"> - {{ range .Children }} - <li class="header-nav-list__item {{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }}"> - <a class="header-nav-list__link" href="{{ .URL }}">{{ .Name }}</a> - </li> - {{ end }} - </ul> - {{ else }} - <li class="header-nav-list__item"> - <a class="header-nav-list__link" href="{{ .URL }}"> - {{ .Pre }} - <span>{{ .Name }}</span> - </a> - </li> - {{ end }} - {{ end }} - </ul> - <button class="header-nav-list__nav-btn">navigation</button> - </nav> - <button class="mb-header__menu-btn"> - <span class="mb-header__menu-btn-line"></span> - <span class="mb-header__menu-btn-line"></span> - <span class="mb-header__menu-btn-line"></span> - </button> + <div class="header header-frame"> + <div> + <div class="header__title {{if not (isset .Site.Params "Description")}}header__title--nomargin{{end}}">{{.Site.Title}}</div> + {{if ( isset .Site.Params "Description")}} + <div class="header__description">{{.Site.Params.Description}}</div> + {{end}} </div> - {{partial "mobile-header-nav" .}} + <nav class="header-nav"> + <ul class="header-nav-list header-nav-list--menu"> + {{ $currentPage := . }} + {{ range .Site.Menus.main }} + {{ if .HasChildren }} + <li class="header-nav-list__item {{ if $currentPage.HasMenuCurrent "main" . }}active{{ end }}"> + <a class="header-nav-list__link" href="#"> + {{ .Pre }} + <span>{{ .Name }}</span> + </a> + </li> + <ul class="header-nav-list"> + {{ range .Children }} + <li class="header-nav-list__item {{ if $currentPage.IsMenuCurrent "main" . }}active{{ end }}"> + <a class="header-nav-list__link" href="{{ .URL }}">{{ .Name }}</a> + </li> + {{ end }} + </ul> + {{ else }} + <li class="header-nav-list__item"> + <a class="header-nav-list__link" href="{{ .URL }}"> + {{ .Pre }} + <span>{{ .Name }}</span> + </a> + </li> + {{ end }} + {{ end }} + </ul> + <button class="header-nav-list__nav-btn">navigation</button> + </nav> + <button class="mb-header__menu-btn"> + <span class="mb-header__menu-btn-line"></span> + <span class="mb-header__menu-btn-line"></span> + <span class="mb-header__menu-btn-line"></span> + </button> + </div> + {{partial "mobile-header-nav" .}} </header> diff --git a/layouts/partials/post-footer.html b/layouts/partials/post-footer.html index 05cd89e..b38ab58 100644 --- a/layouts/partials/post-footer.html +++ b/layouts/partials/post-footer.html @@ -6,5 +6,3 @@ <div class="footer__socials">{{partial "social.html" .}}</div> </div> </footer> -{{$script := resources.Get "js/script.js"}} -<script src="{{$script.Permalink}}"></script> diff --git a/layouts/partials/post-header.html b/layouts/partials/post-header.html index 8a27967..7aa6807 100644 --- a/layouts/partials/post-header.html +++ b/layouts/partials/post-header.html @@ -1,7 +1,9 @@ <header> <div class="header header-frame"> <div> - <div class="header__title">{{.Title}}</div> + {{with .Title}} + <div class="header__title">{{.}}</div> + {{end}} {{with .Description}} <div class="header__description">{{.}}</div> {{end}} diff --git a/layouts/partials/script.html b/layouts/partials/script.html new file mode 100644 index 0000000..a02b6ec --- /dev/null +++ b/layouts/partials/script.html @@ -0,0 +1,2 @@ +{{$script := resources.Get "js/script.js"}} +<script src="{{$script.Permalink}}"></script> |