From 8ef2aba07fabac45139edcb707d573c258c2df45 Mon Sep 17 00:00:00 2001 From: "Aaron N. Brock" Date: Sat, 3 Oct 2020 02:04:33 -0400 Subject: [PATCH] idk what i did --- assets/scss/_typography.scss | 2 +- assets/scss/components/_blog-section.scss | 2 +- assets/scss/components/_blog.scss | 2 +- assets/scss/components/_footer-section.scss | 19 ------- assets/scss/style.scss | 2 +- layouts/blog/list.html | 38 ++++++------- layouts/partials/blogSection.html | 16 +++--- layouts/partials/footer.html | 3 +- layouts/partials/pagination.html | 59 +++++++++++---------- 9 files changed, 63 insertions(+), 80 deletions(-) diff --git a/assets/scss/_typography.scss b/assets/scss/_typography.scss index 33fd646..c8bccf6 100644 --- a/assets/scss/_typography.scss +++ b/assets/scss/_typography.scss @@ -27,7 +27,7 @@ a.text-light, a.text-dark { top: 50%; left: -20px; transform: translateX(-50%); - background: $secondary-color; + background: $secondary; } } diff --git a/assets/scss/components/_blog-section.scss b/assets/scss/components/_blog-section.scss index 3273de0..57d69b7 100644 --- a/assets/scss/components/_blog-section.scss +++ b/assets/scss/components/_blog-section.scss @@ -1,4 +1,4 @@ -.blog{ +.blog-preview { position: relative; margin-bottom: 30px; &__shape{ diff --git a/assets/scss/components/_blog.scss b/assets/scss/components/_blog.scss index e946cf8..bcf1adf 100644 --- a/assets/scss/components/_blog.scss +++ b/assets/scss/components/_blog.scss @@ -1,4 +1,4 @@ -.blog { +.blog-page { &__item { position: relative; margin-bottom: 120px; diff --git a/assets/scss/components/_footer-section.scss b/assets/scss/components/_footer-section.scss index bea84a0..85e50c1 100644 --- a/assets/scss/components/_footer-section.scss +++ b/assets/scss/components/_footer-section.scss @@ -138,30 +138,11 @@ } &_social{ ul{ - margin: 0; - padding: 0; float: right; @include desktop{ margin: 20px auto 0; float: none; } - li{ - list-style: none; - display: inline-block; - a{ - display: block; - text-decoration: none; - color: #fff; - font-size: 20px; - transition: all .3s ease; - &:hover{ - color: $primary-color; - } - } - &:not(:last-child){ - margin-right: 25px; - } - } } } } diff --git a/assets/scss/style.scss b/assets/scss/style.scss index 80866fc..aaf476d 100644 --- a/assets/scss/style.scss +++ b/assets/scss/style.scss @@ -38,7 +38,7 @@ VERSION: 1.0.0 @import "components/footer-section"; -// @import "components/blog"; +@import "components/blog"; @import "components/single-blog-post"; diff --git a/layouts/blog/list.html b/layouts/blog/list.html index d9853a6..476109e 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -36,25 +36,25 @@ -
-
-
- {{ range .Paginator.Pages }} -
-
-
- post-image -
-
- {{ .PublishDate.Format "January 2, 2006" }} - {{ .Title }} -
-
-
- {{ end }} - {{ partial "pagination" .}} -
-
+
+
+
+ {{ range .Paginator.Pages }} +
+
+
+ post-image +
+
+ {{ .PublishDate.Format "January 2, 2006" }} + {{ .Title }} +
+
+
+ {{ end }} + {{ partial "pagination" .}} +
+
{{ end }} \ No newline at end of file diff --git a/layouts/partials/blogSection.html b/layouts/partials/blogSection.html index 0aa081f..7b44632 100644 --- a/layouts/partials/blogSection.html +++ b/layouts/partials/blogSection.html @@ -1,19 +1,19 @@ {{ with .Site.Data.blogSection }} {{ if .enable }} -
-
+
+
blog shape
-
+
{{ .topTitle }} {{ .title | markdownify }}
- @@ -22,11 +22,11 @@
{{ range first 3 (where $.Site.RegularPages "Type" "!=" "portfolio") }}
-
-
+
+
post-image
-
+
{{ .PublishDate.Format "January 2, 2006" }}

{{ .Title }} @@ -39,7 +39,7 @@

- diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 0f39c04..e7f3431 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -77,7 +77,8 @@
    {{ $social := .Site.Params.social }} {{ range $social }} -
  • +
  • {{ end }}
diff --git a/layouts/partials/pagination.html b/layouts/partials/pagination.html index 5893e21..30823f7 100644 --- a/layouts/partials/pagination.html +++ b/layouts/partials/pagination.html @@ -1,33 +1,34 @@ {{ $pag := $.Paginator }} {{ if gt $pag.TotalPages 1 }} -
- + +
{{ end }} \ No newline at end of file