diff options
| author | Robert Austin <rob@jugglerdigital.com> | 2020-08-19 14:32:35 +0300 |
|---|---|---|
| committer | Robert Austin <rob@jugglerdigital.com> | 2020-08-19 14:32:35 +0300 |
| commit | 5cfc9965a48bbe76198d2f727c4b59978979c77f (patch) | |
| tree | 78b2c4eccccfab8e7643fb06cd97af1a9d03aa10 /layouts | |
| parent | be4a6cc64360638c08620aafa300d19d10b61243 (diff) | |
touch ups
Diffstat (limited to 'layouts')
| -rw-r--r-- | layouts/_default/baseof.html | 8 | ||||
| -rw-r--r-- | layouts/index.html | 2 | ||||
| -rw-r--r-- | layouts/page/contact.html | 2 | ||||
| -rw-r--r-- | layouts/partials/call.html | 20 | ||||
| -rw-r--r-- | layouts/partials/sub-footer.html | 13 | ||||
| -rwxr-xr-x | layouts/team/summary-large.html | 2 | ||||
| -rwxr-xr-x | layouts/team/summary.html | 2 |
7 files changed, 24 insertions, 25 deletions
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 7e8f3a7..82b618a 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -2,13 +2,12 @@ <html lang="en"> <head> - {{ partial "google-tag-manager.html" . }} <meta charset="utf-8"> <meta http-equiv="x-ua-compatible" content="ie=edge"> <title>{{ block "title" . }}{{ .Title }} - {{ .Site.Title }}{{ end }}</title> <meta name="viewport" content="width=device-width, initial-scale=1"> {{ block "meta_tags" . }}{{end}} - <link rel="icon" href="{{ "favicon-32x32.png" | relURL }}"> + <link rel="icon" type="image/png" href="{{ "favicon-32x32.png" | relURL }}"> <!-- CSS--> {{ if .Site.IsServer }} @@ -26,7 +25,6 @@ </head> <body class='page {{ block "body_classes" . }}{{ end }}'> - {{ partial "google-tag-manager-noscript.html" . }} {{ partial "main-menu-mobile.html" . }} <div class="wrapper"> {{ partial "header.html" . }} @@ -48,10 +46,8 @@ <script type="text/javascript" src="{{ ($scripts | minify | fingerprint).RelPermalink }}"></script> {{ end }} + {{ partial "google-tag-manager.html" . }} {{ partial "google-analytics.html" . }} - - <!-- Google Font --> - <link href="https://fonts.googleapis.com/css?family=DM+Serif+Display&display=swap" rel="stylesheet"> </body> </html> diff --git a/layouts/index.html b/layouts/index.html index a134dc8..67a10fc 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -21,7 +21,7 @@ <div class="row justify-content-start"> <div class="col-12 col-md-7 col-lg-6 order-2 order-md-1"> {{ .Content }} - {{ partial "call.html" . }} + {{ partial "call.html" (dict "site" .Site "context" . "show_button" "true") }} </div> {{ if .Params.intro_image }} <div class="col-12 col-md-5 col-lg-6 order-1 order-md-2 position-relative"> diff --git a/layouts/page/contact.html b/layouts/page/contact.html index e9f0d4c..7dc60da 100644 --- a/layouts/page/contact.html +++ b/layouts/page/contact.html @@ -8,7 +8,7 @@ <div class="col-12 col-md-8"> <div class="service service-single"> <h1 class="title">{{.Title}}</h1> - {{ partial "call.html" . }} + {{ partial "call.html" (dict "site" .Site "context" . "show_button" "false") }} <div class="content mt-4">{{.Content}}</div> </div> </div> diff --git a/layouts/partials/call.html b/layouts/partials/call.html index c53728f..f5fd0d3 100644 --- a/layouts/partials/call.html +++ b/layouts/partials/call.html @@ -1,15 +1,19 @@ <div class="call"> <div class="call-box-top"> -{{ if .Site.Data.contact.phone }} - <div class="call-phone"><strong>Phone: </strong> {{ .Site.Data.contact.phone }} </div> -{{ end }} + {{ if .site.Data.contact.phone }} + <div class="call-phone"><strong>Phone: </strong> {{ .site.Data.contact.phone }} </div> + {{ end }} + {{ if .site.Data.contact.email }} <div class="call-email"><strong>Email: </strong> - <a href="mailto:{{ .Site.Data.contact.email }}"> - {{ .Site.Data.contact.email }} + <a href="mailto:{{ .site.Data.contact.email }}"> + {{ .site.Data.contact.email }} </a> </div> + {{ end }} </div> - <div class="call-box-bottom"> - <a href="{{ "contact/" | relURL }}" class="button">Contact</a> - </div> + {{ if eq .show_button "true" }} + <div class="call-box-bottom"> + <a href="{{ "contact/" | relURL }}" class="button">Contact</a> + </div> + {{ end }} </div> diff --git a/layouts/partials/sub-footer.html b/layouts/partials/sub-footer.html index 7ca64f1..ecfd31f 100644 --- a/layouts/partials/sub-footer.html +++ b/layouts/partials/sub-footer.html @@ -4,13 +4,12 @@ <div class="col-12"> <div class="sub-footer-inner"> <ul> -{{ if .Site.Data.contact.phone }} - <li><strong>Phone: </strong><span>{{ .Site.Data.contact.phone }}</span></li> -{{ end }} -{{ if .Site.Data.contact.email }} - <li><strong>Email: </strong><a href="mailto:{{ .Site.Data.contact.email }}"> - {{ .Site.Data.contact.email }}</a></li> -{{ end }} + {{ if .Site.Data.contact.phone }} + <li><strong>Phone: </strong><span>{{ .Site.Data.contact.phone }}</span></li> + {{ end }} + {{ if .Site.Data.contact.email }} + <li><strong>Email: </strong><a href="mailto:{{ .Site.Data.contact.email }}">{{ .Site.Data.contact.email }}</a></li> + {{ end }} </ul> <a class="zerostatic" href="https://www.zerostatic.io">www.zerostatic.io</a> </div> diff --git a/layouts/team/summary-large.html b/layouts/team/summary-large.html index bcb8971..bc0f9da 100755 --- a/layouts/team/summary-large.html +++ b/layouts/team/summary-large.html @@ -8,7 +8,7 @@ <h2 class="team-name">{{ .Title }}</h2> <p class="team-description">{{ .Params.Jobtitle }}</p> {{ if .Params.Linkedinurl }} - <a target="_blank" href="{{ .Params.Linkedinurl }}">Linked In</a> {{ end }} + <a target="_blank" href="{{ .Params.Linkedinurl }}">LinkedIn</a> {{ end }} </div> <div class="team-content"> {{ .Content | truncate 120 "…" }}</div> </div>
\ No newline at end of file diff --git a/layouts/team/summary.html b/layouts/team/summary.html index 11aa48c..d913020 100755 --- a/layouts/team/summary.html +++ b/layouts/team/summary.html @@ -8,7 +8,7 @@ <h2 class="team-name">{{ .Title }}</h2> <p class="team-description">{{ .Params.Jobtitle }}</p> {{ if .Params.Linkedinurl }} - <a target="_blank" href="{{ .Params.Linkedinurl }}">Linked In</a> {{ end }} + <a target="_blank" href="{{ .Params.Linkedinurl }}">LinkedIn</a> {{ end }} </div> <div class="team-content"></div> </div>
\ No newline at end of file |