diff --git a/assets/scss/_common.scss b/assets/scss/_common.scss index df0e24d..0db1fb8 100644 --- a/assets/scss/_common.scss +++ b/assets/scss/_common.scss @@ -34,7 +34,7 @@ img { a, a:hover, a:focus { - text-decoration: none; + text-decoration: underline; color: $primary-color; } @@ -43,6 +43,11 @@ a.text-primary:hover{ color: $primary-color !important; } +a.btn { + text-decoration: none; +} + + a, button, @@ -224,4 +229,4 @@ a.bg-primary:focus, a.bg-primary:hover, button.bg-primary:focus, button.bg-prima /* Various */ .grayscale-60 { filter: grayscale(60%); -} \ No newline at end of file +} diff --git a/assets/scss/_typography.scss b/assets/scss/_typography.scss index aeaea93..dd52872 100644 --- a/assets/scss/_typography.scss +++ b/assets/scss/_typography.scss @@ -1,8 +1,41 @@ /* typography */ -// TODO To be served locally later -@import url('https://fontlibrary.org//face/gen-light'); -@import url('https://fontlibrary.org//face/kallaikos-revve-kallaikosrevve'); +@font-face { + font-family: 'KallaikosrevveRegular'; + src: url('/webfonts/KallaikosrevveRegular.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'GenLight'; + src: url('/webfonts/Gen-Light.otf') format('truetype'); + font-weight: normal; + font-style: normal; +} + +@font-face { + font-family: 'PanameraLight'; + src: url('/webfonts/Panamera/Panamera-Light.otf') format('truetype'); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: 'PanameraRegular'; + src: url('/webfonts/Panamera/Panamera-Regular.otf') format('truetype'); + font-weight: 500; + font-style: normal; +} + +@font-face { + font-family: 'PanameraBold'; + src: url('/webfonts/Panamera/Panamera-Bold.otf') format('truetype'); + font-weight: 700; + font-style: normal; +} + + body { line-height: 1.4; @@ -24,19 +57,23 @@ p, .paragraph { .h1, .h2, .h3, .h4, .h5, .h6, h1, h2, h3, h4, h5, h6 { color: $text-color-dark; font-weight: 400; - line-height: 1.3 !important; + line-height: 0.8!important; &:not([class^='ti-']) { font-family: $primary-font; } + text-decoration: none; + &:hover { + text-decoration: none; + } } .section-header { font-variant: small-caps; - font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif !important; - font-weight: 600 !important; + font-family: PanameraRegular, Gen-Light, Tahoma, Geneva, Verdana, sans-serif !important; + font-weight: 500 !important; } -a{ +a { &.h1,&.h2,&.h3,&.h4,&.h5,&.h6{ color: $text-color-dark; } diff --git a/assets/scss/_variables.scss b/assets/scss/_variables.scss index 7c41394..323d5f1 100644 --- a/assets/scss/_variables.scss +++ b/assets/scss/_variables.scss @@ -10,6 +10,5 @@ $white: #fff; $gray: #f4fcff; // Font Variables -//$primary-font: 'GenLight', sans-serif; -$primary-font: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; -$icon-font: 'fontawesome'; \ No newline at end of file +$primary-font: 'GenLight','Segoe UI', Geneva, Verdana, sans-serif; +$icon-font: 'fontawesome'; diff --git a/assets/scss/templates/_cv.scss b/assets/scss/templates/_cv.scss index 42785fb..1e460d8 100644 --- a/assets/scss/templates/_cv.scss +++ b/assets/scss/templates/_cv.scss @@ -7,3 +7,9 @@ max-height: 100px; } } + +.card { + &-body { + padding: 1em; + } +} diff --git a/assets/scss/templates/_main.scss b/assets/scss/templates/_main.scss index 3062f60..134870d 100644 --- a/assets/scss/templates/_main.scss +++ b/assets/scss/templates/_main.scss @@ -1,4 +1,10 @@ /* card */ +.card { + &-body { + padding: 0px; + } +} + .posts { border: 0; border-radius: 0; @@ -15,6 +21,15 @@ object-fit: cover; width: 100%; height: 100%; + max-height: 250px; + } +} + +.post { + &-img { + display: block; + max-height: 400px; + margin: auto; } } @@ -103,6 +118,7 @@ line-height: 40px; border: 1px solid transparent; font-size: 20px; + text-decoration: underline; &:hover { background-color: $white; @@ -161,6 +177,7 @@ border: 1px solid transparent; font-size: 15px; padding: 5px; + text-decoration: none; &:hover, @@ -190,7 +207,7 @@ h6 { margin-bottom: 10px; } - + ol { padding-left: 20px; } @@ -286,4 +303,4 @@ color: $text-color-dark; } -} \ No newline at end of file +} diff --git a/assets/scss/templates/_navigation.scss b/assets/scss/templates/_navigation.scss index 8d27085..322f0d3 100644 --- a/assets/scss/templates/_navigation.scss +++ b/assets/scss/templates/_navigation.scss @@ -22,6 +22,10 @@ font-weight: bold; font-size: 26px; color: $text-color-dark; + text-decoration: none; + &:hover { + text-decoration: none; + } } /* Collapses */ @@ -119,4 +123,4 @@ @include desktop { display: none; } -} \ No newline at end of file +} diff --git a/layouts/_default/index.rss.xml b/layouts/_default/index.rss.xml index feccc7a..24b3ad2 100644 --- a/layouts/_default/index.rss.xml +++ b/layouts/_default/index.rss.xml @@ -2,7 +2,7 @@ {{- if .IsHome -}}{{ $pctx = .Site }}{{- end -}} {{- $pages := slice -}} {{- if or $.IsHome $.IsSection -}} -{{- $pages = $pctx.RegularPages -}} +{{- $pages = where $pctx.RegularPages "Section" "blog" -}} {{- else -}} {{- $pages = $pctx.Pages -}} {{- end -}} diff --git a/layouts/blog/list.html b/layouts/blog/list.html index 2115d99..e66ace2 100644 --- a/layouts/blog/list.html +++ b/layouts/blog/list.html @@ -2,7 +2,7 @@
-
+
{{- $pctx := . -}} @@ -57,4 +57,4 @@
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/blog/single.html b/layouts/blog/single.html index 5695ffd..0807cab 100644 --- a/layouts/blog/single.html +++ b/layouts/blog/single.html @@ -4,20 +4,20 @@
-
+
{{ if .Params.tags }} {{ partial "tags" .Params.tags }} {{ end }}
-

{{ .Title }}

+

{{ .Title }}

{{ i18n "published" }} {{ i18n "on" }} {{ (time .Date) | time.Format (.Params.date_format | default "2 January 2006") }}. {{ i18n "readingTime" }} {{ i18n "readingTimeValue" .ReadingTime }}.

{{ if .Params.Image }} {{ $article := .Permalink | relURL }} {{ $image := .Params.Image | relURL }} - {{ .Title | markdownify }} + {{ .Title | markdownify }} {{ end }} {{ .Content }} diff --git a/layouts/cv/list.html b/layouts/cv/list.html index f91f6c3..a85482c 100644 --- a/layouts/cv/list.html +++ b/layouts/cv/list.html @@ -3,7 +3,7 @@
{{ .Page.Content }}
-
+
{{ $cv_sections := where .Pages "Params.Widget" "cv"}} {{ range $ids, $item := sort $cv_sections ".Params.weight" "asc" }} {{ $items_len := len .Params.items }} @@ -96,4 +96,4 @@
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/index.html b/layouts/index.html index 6182b85..62549e1 100644 --- a/layouts/index.html +++ b/layouts/index.html @@ -4,7 +4,7 @@
-
+

{{ i18n "lastPosts" }}

{{ range first 5 (where .Site.RegularPages "Type" "blog") }}
@@ -56,4 +56,4 @@
-{{ end }} \ No newline at end of file +{{ end }} diff --git a/layouts/shortcodes/castopod.html b/layouts/shortcodes/castopod.html new file mode 100644 index 0000000..0860823 --- /dev/null +++ b/layouts/shortcodes/castopod.html @@ -0,0 +1 @@ + diff --git a/static/webfonts/Gen-Light.otf b/static/webfonts/Gen-Light.otf new file mode 100644 index 0000000..39f5c11 Binary files /dev/null and b/static/webfonts/Gen-Light.otf differ diff --git a/static/webfonts/KallaikosrevveRegular.ttf b/static/webfonts/KallaikosrevveRegular.ttf new file mode 100644 index 0000000..413e576 Binary files /dev/null and b/static/webfonts/KallaikosrevveRegular.ttf differ diff --git a/static/webfonts/Panamera/.DS_Store b/static/webfonts/Panamera/.DS_Store new file mode 100644 index 0000000..5008ddf Binary files /dev/null and b/static/webfonts/Panamera/.DS_Store differ diff --git a/static/webfonts/Panamera/Panamera-Bold.otf b/static/webfonts/Panamera/Panamera-Bold.otf new file mode 100644 index 0000000..bbd8284 Binary files /dev/null and b/static/webfonts/Panamera/Panamera-Bold.otf differ diff --git a/static/webfonts/Panamera/Panamera-Light.otf b/static/webfonts/Panamera/Panamera-Light.otf new file mode 100644 index 0000000..123d9a3 Binary files /dev/null and b/static/webfonts/Panamera/Panamera-Light.otf differ diff --git a/static/webfonts/Panamera/Panamera-Regular.otf b/static/webfonts/Panamera/Panamera-Regular.otf new file mode 100644 index 0000000..a5c62aa Binary files /dev/null and b/static/webfonts/Panamera/Panamera-Regular.otf differ