From 61e18d554d09a5adc0cbddd899bdf9f425539fbd Mon Sep 17 00:00:00 2001 From: Jerry Kiely Date: Wed, 27 Nov 2019 12:33:45 +0000 Subject: some cleanup --- exampleSite/config.toml | 8 ----- layouts/index.html | 30 +++++++++---------- layouts/partials/footer.html | 14 ++++----- layouts/partials/head.html | 20 ++++++------- layouts/partials/header.html | 20 +++++++------ layouts/partials/lang.html | 2 -- layouts/partials/navbar.html | 38 +++++++++++------------ layouts/partials/projects.html | 68 +++++++++++++++++++----------------------- layouts/partials/scripts.html | 8 ++--- layouts/partials/summary.html | 56 +++++++++++++++++----------------- 10 files changed, 126 insertions(+), 138 deletions(-) delete mode 100644 layouts/partials/lang.html diff --git a/exampleSite/config.toml b/exampleSite/config.toml index 56284a1..b04105b 100644 --- a/exampleSite/config.toml +++ b/exampleSite/config.toml @@ -79,10 +79,8 @@ googleAnalytics = "UA-XXXXXXX-Y" [[params.projects.sections]] # title = "Section 1" - [[params.projects.sections.rows]] # title = "Section 1, Row 1" - [[params.projects.sections.rows.items]] title = "Card title 1" description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus." @@ -98,10 +96,8 @@ googleAnalytics = "UA-XXXXXXX-Y" description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque." url = "#" image = "300x200.png" - [[params.projects.sections.rows]] # title = "Section 1, Row 2" - [[params.projects.sections.rows.items]] title = "Card title 4" description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus." @@ -116,10 +112,8 @@ googleAnalytics = "UA-XXXXXXX-Y" [[params.projects.sections]] # title = "Section 2" - [[params.projects.sections.rows]] # title = "Section 2, Row 1" - [[params.projects.sections.rows.items]] title = "Card title 1" description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus." @@ -135,10 +129,8 @@ googleAnalytics = "UA-XXXXXXX-Y" description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque." url = "#" image = "300x200.png" - [[params.projects.sections.rows]] # title = "Section 2, Row 2" - [[params.projects.sections.rows.items]] title = "Card title 4" description = "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sapiente esse necessitatibus neque sequi doloribus." diff --git a/layouts/index.html b/layouts/index.html index 102f4e9..5fdf387 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -1,32 +1,32 @@ -{{ partial "lang.html" . }} + - + - {{ partial "head.html" . }} + {{ partial "head.html" . }} - + - + - {{ partial "navbar.html" . }} + {{ partial "navbar.html" . }} - {{ partial "header.html" . }} + {{ partial "header.html" . }} - -
+ +
- {{ partial "summary.html" . }} + {{ partial "summary.html" . }} - {{ partial "projects.html" . }} + {{ partial "projects.html" . }} -
+
- {{ partial "footer.html" . }} + {{ partial "footer.html" . }} - {{ partial "scripts.html" . }} + {{ partial "scripts.html" . }} - + diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index db5e6e7..d8d21cc 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,8 +1,8 @@ - - + + diff --git a/layouts/partials/head.html b/layouts/partials/head.html index a98bf3d..d2fafbd 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -1,14 +1,14 @@ - {{ .Site.Title }} + {{ .Site.Title }} - - - - + + + + - + - - - - + + + + diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 77fa68d..76d7506 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,12 +1,14 @@ - -
-
-
-
-

{{ .Site.Params.header.name }}

-

{{ .Site.Params.header.tagline }}

+ +
+
+
+
+ {{ with .Site.Params.header }} +

{{ .name }}

+

{{ .tagline }}

+ {{ end }} +
-
-
+ diff --git a/layouts/partials/lang.html b/layouts/partials/lang.html deleted file mode 100644 index 5da485c..0000000 --- a/layouts/partials/lang.html +++ /dev/null @@ -1,2 +0,0 @@ - - diff --git a/layouts/partials/navbar.html b/layouts/partials/navbar.html index cfc7255..90afcc0 100644 --- a/layouts/partials/navbar.html +++ b/layouts/partials/navbar.html @@ -1,23 +1,23 @@ - - diff --git a/layouts/partials/projects.html b/layouts/partials/projects.html index 0ceb2e5..5f0c0b7 100644 --- a/layouts/partials/projects.html +++ b/layouts/partials/projects.html @@ -1,41 +1,35 @@ - {{ range .Site.Params.projects.sections }} - - {{ if .title }} -
-
-

{{ .title }}

-
-
-
- {{ end }} - - {{ range .rows }} -
- - {{ if .title }} -
-

{{ .title }}

-
-
- {{ end }} - - {{ range .items }} -
-
- -
-

{{ .title }}

-

{{ .description }}

+ {{ range .Site.Params.projects.sections }} + {{ if .title }} +
+
+

{{ .title }}

+
+
+
+ {{ end }} + {{ range .rows }} +
+ {{ if .title }} +
+

{{ .title }}

+
-
- {{ i18n "link" }} + {{ end }} + {{ range .items }} +
+
+ +
+

{{ .title }}

+

{{ .description }}

+
+
+ {{ i18n "link" }} +
+
-
-
+ {{ end }} +
+ {{ end }} {{ end }} - -
- {{ end }} - - {{ end }} diff --git a/layouts/partials/scripts.html b/layouts/partials/scripts.html index 02a8ca9..de1de64 100644 --- a/layouts/partials/scripts.html +++ b/layouts/partials/scripts.html @@ -1,6 +1,6 @@ - - - + + + - {{ template "_internal/google_analytics_async.html" . }} + {{ template "_internal/google_analytics_async.html" . }} diff --git a/layouts/partials/summary.html b/layouts/partials/summary.html index adaebad..a110de1 100644 --- a/layouts/partials/summary.html +++ b/layouts/partials/summary.html @@ -1,31 +1,33 @@ -
+
-
-

{{ i18n "about" }}

-
- {{ range .Site.Params.summary.description.items }} -

{{ .description }}

- {{ end }} - {{ i18n "more" }} » -
+
+

{{ i18n "about" }}

+
+ {{ range .Site.Params.summary.description.items }} +

{{ .description }}

+ {{ end }} + {{ i18n "more" }} » +
-
-

{{ i18n "contact" }}

-
-
- {{ .Site.Params.summary.contact.name }} -
{{ .Site.Params.summary.contact.address1 }} -
{{ .Site.Params.summary.contact.address2 }} -
-
-
- P: - {{ .Site.Params.summary.contact.phone }} -
- E: - {{ .Site.Params.summary.contact.email }} -
-
+
+

{{ i18n "contact" }}

+
+ {{ with .Site.Params.summary.contact }} +
+ {{ .name }} +
{{ .address1 }} +
{{ .address2 }} +
+
+
+ P: + {{ .phone }} +
+ E: + {{ .email }} +
+ {{ end }} +
-
+
-- cgit v1.2.3