Skip to content

Various fixes #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glc-mvion wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Various fixes #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ <h3>{{ .Title }}</h3>
{{- range .Paginator.Pages }}
<div class="mdl-card__list-item mdl-color-text--grey-600">
<div class="hmdl-page-meta">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong><a href="{{ .Params.author.website }}">{{ .Params.author.name }}</a></strong>
<strong><a href="{{ default .Site.Params.website .Params.author.website }}">{{ default .Site.Params.author .Params.author.name }}</a></strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
<a href="{{ .RelPermalink }}"><h5 class="mdl-color-text--grey-600">{{ title .Title }}</h5></a>
Expand Down
12 changes: 6 additions & 6 deletions layouts/_default/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,22 @@
<h3 {{ with .Params.cardtitlecolor }}style="color:{{.}};"{{end}}>{{ title .Title }}</h3>
</div>
<div class="hmdl-page-meta mdl-color-text--grey-700 mdl-card__supporting-text">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong>{{ .Params.author.name }}</strong>
<strong>{{ default .Site.Params.author .Params.author.name}}</strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
<div class="section-spacer"></div>
</div>
<div class="hmdl-page-content mdl-color-text--grey-700 mdl-card__supporting-text">
{{ .Content }}
</div>
<div class="hmdl-page-comments mdl-color-text--primary-contrast mdl-card__supporting-text comments">
<a href={{ .Params.author.website }}>{{ .Params.author.name }}</a>
<p>{{ .Params.author.description }}</p>
</div>
<div class="hmdl-page-comments mdl-card__supporting-text comments">
<a href="{{ default .Site.Params.website .Params.author.website }}">{{ default .Site.Params.author .Params.author.name }}</a>
<p>{{ default .Site.Params.description .Params.author.description }}</p>
</div>
</div>
</div>
{{- partial "footer.html" . }}
2 changes: 1 addition & 1 deletion layouts/partials/footer.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{{- end }}
<div class="mdl-layout__obfuscator"></div>
</div>
<script src="https://code.getmdl.io/1.1.3/material.min.js"></script>
<script defer src="https://code.getmdl.io/1.3.0/material.min.js"></script>
{{- if and .IsPage (eq .Type "presentation") }}
<script src="https://remarkjs.com/downloads/remark-latest.min.js">
</script>
Expand Down
16 changes: 2 additions & 14 deletions layouts/partials/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,21 +30,9 @@
<meta name="msapplication-TileImage" content="{{ .Site.BaseURL }}images/touch/ms-touch-icon-144x144-precomposed.png">
<meta name="msapplication-TileColor" content="#3372DF">

<!-- Allow user to choose MDL theme -->
{{- if isset .Site.Params "mdlPrimary" }}
{{- $.Scratch.Set "mdlPrimary" .Site.Params.mdlPrimary }}
{{- else }}
{{- $.Scratch.Set "mdlPrimary" "grey" }}
{{- end }}
{{- if isset .Site.Params "mdlAccent" }}
{{- $.Scratch.Set "mdlAccent" .Site.Params.mdlAccent }}
{{- else }}
{{- $.Scratch.Set "mdlAccent" "orange" }}
{{- end -}}

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:regular,bold,italic,thin,light,bolditalic,black,medium&amp;lang=en"/>
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/ionicons.min.css"/>
<link rel="stylesheet" href="https://storage.googleapis.com/code.getmdl.io/1.1.3/material.{{ $.Scratch.Get "mdlPrimary" }}-{{ $.Scratch.Get "mdlAccent" }}.min.css"/>
<link rel="stylesheet" href="/css/ionicons.min.css"/>
<link rel="stylesheet" href="https://code.getmdl.io/1.3.0/material.{{ default "grey" .Site.Params.mdlPrimary }}-{{ default "orange" .Site.Params.mdlSecondary }}.min.css"/>
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="{{ .Site.BaseURL }}css/hmdl-style.css"/>
{{- if and .IsPage (eq .Type "presentation") }}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/postsnippets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- range $index, $element := first .Site.Params.frontpageposts (where .Site.Pages "Section" "post") }}
{{- range $index, $element := first (default 6 .Site.Params.frontpageposts) (where .Site.Pages "Section" "post") }}
{{- if (eq $index 0) }}
{{- .Render "card-8" }}
{{- else }}
Expand Down
4 changes: 2 additions & 2 deletions layouts/post/card-12.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ <h3><a href="{{ .RelPermalink }}" {{ with .Params.cardtitlecolor }}style="color:
{{ .Summary }}
</div>
<div class="hmdl-page-meta mdl-card__supporting-text mdl-color-text--grey-600">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong><a href="{{ .Params.author.website }}">{{ .Params.author.name }}</a></strong>
<strong><a href="{{ default .Site.Params.website .Params.author.website }}">{{ default .Site.Params.author .Params.author.name }}</a></strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions layouts/post/card-8.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ <h3><a href="{{ .RelPermalink }}" {{ with .Params.cardtitlecolor }}style="color:
{{ .Summary }}
</div>
<div class="hmdl-page-meta mdl-card__supporting-text mdl-color-text--grey-600">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong><a href="{{ .Params.author.website }}">{{ .Params.author.name }}</a></strong>
<strong><a href="{{ default .Site.Params.website .Params.author.website }}">{{ default .Site.Params.author .Params.author.name }}</a></strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
</div>
Expand Down
4 changes: 2 additions & 2 deletions layouts/post/listitem.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!-- Styling for a single list item -->
<div class="mdl-card__list-item mdl-color-text--grey-600">
<div class="hmdl-page-meta">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong><a href="{{ .Params.author.website }}">{{ .Params.author.name }}</a></strong>
<strong><a href="{{ default .Site.Params.website .Params.author.website }}">{{ default .Site.Params.author .Params.author.name }}</a></strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
<a href="{{ .RelPermalink }}"><h5 class="mdl-color-text--grey-600">{{ title .Title }}</h5></a>
Expand Down
10 changes: 5 additions & 5 deletions layouts/post/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@
<h3 {{ with .Params.cardtitlecolor }}style="color:{{.}};"{{end}}>{{ title .Title }}</h3>
</div>
<div class="hmdl-page-meta mdl-color-text--grey-700 mdl-card__supporting-text">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong>{{ .Params.author.name }}</strong>
<strong>{{ default .Site.Params.author .Params.author.name }}</strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
<div class="section-spacer"></div>
</div>
<div class="hmdl-page-content mdl-color-text--grey-700 mdl-card__supporting-text">
{{ .Content }}
</div>
<div class="hmdl-page-comments mdl-color-text--primary-contrast mdl-card__supporting-text comments">
<a href={{ .Params.author.website }}>{{ .Params.author.name }}</a>
<p>{{ .Params.author.description }}</p>
<div class="hmdl-page-comments mdl-card__supporting-text comments">
<a href={{ default .Site.Params.website .Params.author.website }}>{{ default .Site.Params.author .Params.author.name }}</a>
<p>{{ default .Site.Params.description .Params.author.description }}</p>
</div>
</div>
{{- partial "prevnextbtns.html" . }}
Expand Down
10 changes: 5 additions & 5 deletions layouts/project/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<h3 {{ with .Params.cardtitlecolor }}style="color:{{.}};"{{end}}>{{ title .Title }}</h3>
</div>
<div class="hmdl-page-meta mdl-color-text--grey-700 mdl-card__supporting-text">
{{- with .Params.author.image }}
{{- with (default .Site.Params.avatar .Params.author.image) }}
<div class="minilogo" style="background-image: url('{{ . | relURL }}');"></div>
{{- end }}
<div>
<strong>{{ .Params.author.name }}</strong>
<strong>{{ default .Site.Params.author .Params.author.name }}</strong>
<span>{{ .Date.Format "Jan 2, 2006" }}</span>
</div>
<div class="section-spacer"></div>
Expand All @@ -29,9 +29,9 @@ <h3 {{ with .Params.cardtitlecolor }}style="color:{{.}};"{{end}}>{{ title .Title
{{ .Content }}
</div>

<div class="hmdl-page-comments mdl-color-text--primary-contrast mdl-card__supporting-text comments">
<a {{with .Params.author.website }}href="{{.}}"{{end}}>{{ .Params.author.name }}</a>
{{- with .Params.author.description }}
<div class="hmdl-page-comments mdl-card__supporting-text comments">
<a {{with .Params.author.website }}href="{{.}}"{{end}}>{{ default .Site.Params.author .Params.author.name }}</a>
{{- with (default .Site.Params.description .Params.author.description) }}
<p>{{.}}</p>
{{- end }}
</div>
Expand Down