diff --git a/assets/sass/components/_home.scss b/assets/sass/components/_home.scss new file mode 100644 index 00000000..3a1da84c --- /dev/null +++ b/assets/sass/components/_home.scss @@ -0,0 +1,9 @@ +.home__about, +.home__photos, +.home__blog { + margin-top: 8vmin; +} + +.home__more { + text-align: right; +} diff --git a/assets/sass/components/_post.scss b/assets/sass/components/_post.scss index a49dfc6e..39b6ab44 100644 --- a/assets/sass/components/_post.scss +++ b/assets/sass/components/_post.scss @@ -1,6 +1,7 @@ .post { border-bottom: 1px dashed $border-color; - padding: 1.5em $pad-min; + margin-top: 2em; + padding-bottom: 1.5em; img { max-width: 100%; diff --git a/assets/sass/components/_site-header.scss b/assets/sass/components/_site-header.scss index 218f3d57..9482e7da 100644 --- a/assets/sass/components/_site-header.scss +++ b/assets/sass/components/_site-header.scss @@ -6,3 +6,7 @@ border-bottom: 1px dashed $text-color-dark; } } + +.site-header__home-link { + color: inherit; +} diff --git a/assets/sass/elements/_blockquote.scss b/assets/sass/elements/_blockquote.scss index 1c8683fd..776239a9 100644 --- a/assets/sass/elements/_blockquote.scss +++ b/assets/sass/elements/_blockquote.scss @@ -1,4 +1,5 @@ blockquote { padding-left: 2rem; border-left: 3px solid $text-color-light; + margin: 1em 0; } diff --git a/assets/sass/main.scss b/assets/sass/main.scss index 6248d11c..fdc9f33e 100644 --- a/assets/sass/main.scss +++ b/assets/sass/main.scss @@ -28,11 +28,13 @@ // 5. Objects – class-based selectors which define undecorated design patterns, // for example media object known from OOCSS @import "objects/container"; +@import "objects/outer"; // 6. Components – specific UI components. // This is where majority of our work takes place and our UI components // are often composed of Objects and Components @import "components/site-header"; +@import "components/home"; @import "components/posts"; @import "components/post"; @import "components/photos"; diff --git a/assets/sass/objects/_outer.scss b/assets/sass/objects/_outer.scss new file mode 100644 index 00000000..f0353783 --- /dev/null +++ b/assets/sass/objects/_outer.scss @@ -0,0 +1,3 @@ +.outer { + padding: 0 $pad-min; +} diff --git a/content/_index.md b/content/_index.md new file mode 100644 index 00000000..5e044335 --- /dev/null +++ b/content/_index.md @@ -0,0 +1,7 @@ +--- +date: '2019-10-16' +--- + +Hi, my name is Dan Barber. I’m a web designer and developer in New York. +I design and build standards compliant websites that are simple, usable and +attractive using open source software technologies. diff --git a/layouts/home.html b/layouts/home.html deleted file mode 100644 index 3a3d3a25..00000000 --- a/layouts/home.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -

Foo

-{{ end }} diff --git a/layouts/index.html b/layouts/index.html new file mode 100644 index 00000000..049ffd9c --- /dev/null +++ b/layouts/index.html @@ -0,0 +1,45 @@ +{{ define "main" }} +
+
+ {{ .Content }} +
+
+ +
+
+
+

Latest Photos

+
+ +
+ {{ range first 3 (where .Site.RegularPages "Section" "photos") }} +
+ {{ partial "photo_thumb.html" . }} +
+ {{ end }} +
+ + +
+
+ +
+
+
+
+

From the Blog

+
+
+ + {{ range first 3 (where .Site.RegularPages "Section" "blog") }} + {{ partial "blog_post_summary.html" . }} + {{ end }} + + +
+
+{{ end }} diff --git a/layouts/partials/blog_post_summary.html b/layouts/partials/blog_post_summary.html new file mode 100644 index 00000000..819d354f --- /dev/null +++ b/layouts/partials/blog_post_summary.html @@ -0,0 +1,17 @@ +
+
+
+

{{.Title}}

+ + +
+
+ + {{ if .Truncated }} + {{.Summary}} + +

Read on →

+ {{ else }} + {{.Content}} + {{ end }} +
diff --git a/layouts/partials/header.html b/layouts/partials/header.html index aa050728..9ab42d89 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -1,5 +1,5 @@ diff --git a/layouts/section/blog.html b/layouts/section/blog.html index b948794f..eefaaf8e 100644 --- a/layouts/section/blog.html +++ b/layouts/section/blog.html @@ -1,22 +1,8 @@ {{ define "main" }}
- {{ range .Paginator.Pages }} -
-
-

{{.Title}}

- - -
- - {{ if .Truncated }} - {{.Summary}} - -

Read on →

- {{ else }} - {{.Content}} - {{ end }} -
- {{ end }} + {{ range .Paginator.Pages }} + {{ partial "blog_post_summary.html" . }} + {{ end }}
diff --git a/layouts/section/photos.html b/layouts/section/photos.html index ca44f364..446c18a7 100644 --- a/layouts/section/photos.html +++ b/layouts/section/photos.html @@ -1,5 +1,5 @@ {{ define "main" }} -
+
{{ range (.Paginator 24).Pages }}