From c7760b989550dccb28c04bd5a4e338ad1e7f9ae4 Mon Sep 17 00:00:00 2001 From: Chris Date: Sat, 14 Apr 2018 16:19:56 -0400 Subject: [PATCH] Updated shared-bulma-theme with updates to partials, added updated entry partials. --- layouts/_default/baseof.html | 21 ++++--- layouts/_default/list.html | 10 +-- layouts/_default/meta.html | 4 ++ layouts/_default/summary.html | 14 ++--- layouts/entry/meta.html | 4 ++ layouts/entry/single.html | 41 +++++------- layouts/page/downloads.html | 11 ++-- layouts/partials/entry/summary.html | 63 +++++++------------ layouts/partials/home_hero.html | 28 --------- layouts/partials/homepage/hero.html | 16 +++++ layouts/partials/homepage/heroContents.html | 1 + layouts/partials/inline/heroSvg.html | 1 + layouts/partials/inline/menuSvg.html | 1 + layouts/partials/layout/footerContents.html | 1 + layouts/partials/layout/navbar.html | 2 +- ...vbar_contents.html => navbarContents.html} | 14 ++--- layouts/partials/layout/sidebar.html | 2 +- layouts/partials/widget/tweet.html | 11 ---- .../header.html => shortcodes/.gitkeep} | 0 19 files changed, 109 insertions(+), 136 deletions(-) create mode 100644 layouts/_default/meta.html create mode 100644 layouts/entry/meta.html delete mode 100644 layouts/partials/home_hero.html create mode 100644 layouts/partials/homepage/hero.html create mode 100644 layouts/partials/homepage/heroContents.html create mode 100644 layouts/partials/inline/heroSvg.html create mode 100644 layouts/partials/inline/menuSvg.html create mode 100644 layouts/partials/layout/footerContents.html rename layouts/partials/layout/{navbar_contents.html => navbarContents.html} (80%) delete mode 100644 layouts/partials/widget/tweet.html rename layouts/{_default/header.html => shortcodes/.gitkeep} (100%) diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 5d5c5d9..15bcb47 100755 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -11,11 +11,14 @@ - {{- if eq .IsPage true }} - - - - {{- end }} + {{ if .IsHome }} + + + + + {{ else if .IsPage }} + {{ .Render "meta" }} + {{ end }} @@ -55,7 +58,11 @@ {{ block "header" . }}{{ end }} {{ $full_width := .Params.FullWidth | default false }} - {{ if eq $full_width true }} + {{- if .IsHome }} +
+ {{ block "main" . }}{{ end }} +
+ {{ else if eq $full_width true }}
{{ block "main" . }}{{ end }}
@@ -74,7 +81,7 @@
- {{ partial "layout/footer_contents.html" . }} + {{ partial "layout/footerContents" . }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index d64271d..e5dc6d1 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,12 +1,14 @@ {{ define "main" }} {{ $paginator := .Paginate .Data.Pages }}
-
-

{{ .Title }}

+

{{ .Title }}

-
- {{ range $paginator.Pages }} {{ .Render "summary" }} {{ end }} +
+ {{ range $paginator.Pages }} +
+ {{ .Render "summary" }}
+ {{ end }}
diff --git a/layouts/_default/meta.html b/layouts/_default/meta.html new file mode 100644 index 0000000..f9af192 --- /dev/null +++ b/layouts/_default/meta.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html index 3b8d781..b27089c 100644 --- a/layouts/_default/summary.html +++ b/layouts/_default/summary.html @@ -1,8 +1,6 @@ -
- - - - - {{ .Title }} - -
\ No newline at end of file + + + + + {{ .Title }} + \ No newline at end of file diff --git a/layouts/entry/meta.html b/layouts/entry/meta.html new file mode 100644 index 0000000..e07e125 --- /dev/null +++ b/layouts/entry/meta.html @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/layouts/entry/single.html b/layouts/entry/single.html index f001438..26544a4 100644 --- a/layouts/entry/single.html +++ b/layouts/entry/single.html @@ -1,37 +1,30 @@ {{ define "header" }} {{ $author := index .Site.Data.authors ( .Params.author | default "" ) }}
-
-
-   +
+
+ {{ .Title }}
-
-
-
- {{ .Title }} -
- {{ if $author }} -
- - Written by {{ $author.name }} - on {{ .Date.Format "January 02 2006" }} - -
- {{ else }} -
- - Written on {{ .Date.Format "January 02 2006" }} - -
- {{ end }} -
+ {{ if $author }} +
+ + Written by {{ $author.name }} + on {{ .Date.Format "January 02 2006" }} +
+ {{ else }} +
+ + Written on {{ .Date.Format "January 02 2006" }} + +
+ {{ end }}
{{ end }} {{ define "main" }} -
+
{{ .Content }}
diff --git a/layouts/page/downloads.html b/layouts/page/downloads.html index d315eb8..0b17bff 100644 --- a/layouts/page/downloads.html +++ b/layouts/page/downloads.html @@ -74,13 +74,12 @@ {{ end }} {{ define "scripts" }} - {{ end }} \ No newline at end of file diff --git a/layouts/partials/entry/summary.html b/layouts/partials/entry/summary.html index fb18084..dfbbee2 100644 --- a/layouts/partials/entry/summary.html +++ b/layouts/partials/entry/summary.html @@ -1,48 +1,33 @@ {{ if .Params.twitter }} -
- - - + {{ else }} {{ $author := index .Site.Data.authors ( .Params.author | default "" ) }} -
-
-   +
+
+ {{ .Title }}
-
-
-
- {{ .Title }} -
- {{ if $author }} -
- - Written by {{ $author.name }} - on {{ .Date.Format "January 02 2006" }} - -
- {{ else }} -
- - Written on {{ .Date.Format "January 02 2006" }} - -
- {{ end }} -
- - {{ .Summary }} - -
-
- - Read More - -
-
+
+ {{ .Date.Format $.Site.Params.fmt.ISO8601 }} +
+
+ {{ .Summary }} +
+
+ + Read More +
{{ end }} \ No newline at end of file diff --git a/layouts/partials/home_hero.html b/layouts/partials/home_hero.html deleted file mode 100644 index 02e9521..0000000 --- a/layouts/partials/home_hero.html +++ /dev/null @@ -1,28 +0,0 @@ -
-
- - -
- -
-
-
-
- -
- {{ partial "home_hero_contents" . }} -
- - -
-
- {{ partial "jumbotron.html" . }} -
-
-
-
-
-
-
\ No newline at end of file diff --git a/layouts/partials/homepage/hero.html b/layouts/partials/homepage/hero.html new file mode 100644 index 0000000..ce7a1b5 --- /dev/null +++ b/layouts/partials/homepage/hero.html @@ -0,0 +1,16 @@ +
+
+ + +
+ +
+
+
+ {{ partial "homepage/heroContents" . }} +
+
+
+
\ No newline at end of file diff --git a/layouts/partials/homepage/heroContents.html b/layouts/partials/homepage/heroContents.html new file mode 100644 index 0000000..b7a1031 --- /dev/null +++ b/layouts/partials/homepage/heroContents.html @@ -0,0 +1 @@ +Cannot find override file: `./layouts/partials/homepage/heroContents.html` \ No newline at end of file diff --git a/layouts/partials/inline/heroSvg.html b/layouts/partials/inline/heroSvg.html new file mode 100644 index 0000000..4ad0670 --- /dev/null +++ b/layouts/partials/inline/heroSvg.html @@ -0,0 +1 @@ +Cannot find override file: `./layouts/partials/inline/heroSvg.html` \ No newline at end of file diff --git a/layouts/partials/inline/menuSvg.html b/layouts/partials/inline/menuSvg.html new file mode 100644 index 0000000..e643274 --- /dev/null +++ b/layouts/partials/inline/menuSvg.html @@ -0,0 +1 @@ +Cannot find override file: `./layouts/partials/inline/menuSvg.html` \ No newline at end of file diff --git a/layouts/partials/layout/footerContents.html b/layouts/partials/layout/footerContents.html new file mode 100644 index 0000000..c5907c3 --- /dev/null +++ b/layouts/partials/layout/footerContents.html @@ -0,0 +1 @@ +Cannot find override file: `./layouts/partials/layout/footerContents.html` \ No newline at end of file diff --git a/layouts/partials/layout/navbar.html b/layouts/partials/layout/navbar.html index 12432d7..cd2db65 100644 --- a/layouts/partials/layout/navbar.html +++ b/layouts/partials/layout/navbar.html @@ -1,3 +1,3 @@ \ No newline at end of file diff --git a/layouts/partials/layout/navbar_contents.html b/layouts/partials/layout/navbarContents.html similarity index 80% rename from layouts/partials/layout/navbar_contents.html rename to layouts/partials/layout/navbarContents.html index 5cd2bd9..5349f73 100644 --- a/layouts/partials/layout/navbar_contents.html +++ b/layouts/partials/layout/navbarContents.html @@ -1,7 +1,7 @@
- {{ partial "menu.html" . }} + {{ partial "inline/menuSvg" }}
@@ -14,7 +14,7 @@
{{ $currentPage := . }} {{ range .Site.Menus.main }} {{ if .HasChildren }}
- + {{ .Name }} @@ -23,14 +23,14 @@
{{ range .Children }} - + {{ .Name }} {{ end }}
{{ else }} - + {{ .Name }} {{ end }} {{ end }} @@ -48,17 +48,17 @@
- + - + - + diff --git a/layouts/partials/layout/sidebar.html b/layouts/partials/layout/sidebar.html index 1417dcd..a2699b3 100644 --- a/layouts/partials/layout/sidebar.html +++ b/layouts/partials/layout/sidebar.html @@ -1 +1 @@ -Cannot find override file: `./layouts/partials/sidebar.html` \ No newline at end of file +Cannot find override file: `./layouts/partials/layout/sidebar.html` \ No newline at end of file diff --git a/layouts/partials/widget/tweet.html b/layouts/partials/widget/tweet.html deleted file mode 100644 index d30f5ad..0000000 --- a/layouts/partials/widget/tweet.html +++ /dev/null @@ -1,11 +0,0 @@ - -
-
-

@{{ .author }}

-
- {{ .message }} -
-
-
-
- \ No newline at end of file diff --git a/layouts/_default/header.html b/layouts/shortcodes/.gitkeep similarity index 100% rename from layouts/_default/header.html rename to layouts/shortcodes/.gitkeep