diff options
author | Yaroslav <contact@yaroslavps.com> | 2020-03-12 18:27:25 +0300 |
---|---|---|
committer | Yaroslav <contact@yaroslavps.com> | 2020-03-12 18:27:25 +0300 |
commit | f3908a51aa9654f7049a5a5f74f89439d076924e (patch) | |
tree | 83b7f7a721efda3ce5a049465e91725c0ad9fe32 | |
parent | da4917f8c673a16ba757b3b911cf5ce36895d74e (diff) | |
download | yaroslavps.com-f3908a51aa9654f7049a5a5f74f89439d076924e.tar.gz yaroslavps.com-f3908a51aa9654f7049a5a5f74f89439d076924e.zip |
added fonts, fixed jinja indenting
-rw-r--r-- | config.toml | 1 | ||||
-rw-r--r-- | static/css/fonts.css | 53 | ||||
-rw-r--r-- | static/css/yaroslavps.css | 36 | ||||
-rw-r--r-- | static/fonts/BlexMono.ttf | bin | 0 -> 879096 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSans-Bold.ttf | bin | 0 -> 153236 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSans-BoldItalic.ttf | bin | 0 -> 161500 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSans-Italic.ttf | bin | 0 -> 161892 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSans-Regular.ttf | bin | 0 -> 153368 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSerif-Bold.ttf | bin | 0 -> 161076 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSerif-BoldItalic.ttf | bin | 0 -> 170008 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSerif-Italic.ttf | bin | 0 -> 170104 bytes | |||
-rw-r--r-- | static/fonts/IBMPlexSerif-Regular.ttf | bin | 0 -> 160352 bytes | |||
-rw-r--r-- | templates/base.html | 16 | ||||
-rw-r--r-- | templates/index.html | 4 | ||||
-rw-r--r-- | templates/weblog.html | 34 |
15 files changed, 107 insertions, 37 deletions
diff --git a/config.toml b/config.toml index 0399481..e31e91d 100644 --- a/config.toml +++ b/config.toml @@ -6,6 +6,7 @@ compile_sass = false highlight_code = true build_search_index = true +default_language = "en" languages = [ {code = "es", search = true}, {code = "ru", search = true}, diff --git a/static/css/fonts.css b/static/css/fonts.css new file mode 100644 index 0000000..be3d523 --- /dev/null +++ b/static/css/fonts.css @@ -0,0 +1,53 @@ +@font-face { + font-family: "IBM Plex Sans"; + src: url("/fonts/IBMPlexSans-Regular.ttf"); +} + +@font-face { + font-family: "IBM Plex Sans"; + src: url("/fonts/IBMPlexSans-Bold.ttf"); + font-weight: bold; +} + +@font-face { + font-family: "IBM Plex Sans"; + src: url("/fonts/IBMPlexSans-Italic.ttf"); + font-style: italic; +} + +@font-face { + font-family: "IBM Plex Sans"; + src: url("/fonts/IBMPlexSans-BoldItalic.ttf"); + font-style: italic; + font-weight: bold; +} + +@font-face { + font-family: "IBM Plex Serif"; + src: url("/fonts/IBMPlexSerif-Regular.ttf"); +} + +@font-face { + font-family: "IBM Plex Serif"; + src: url("/fonts/IBMPlexSerif-Bold.ttf"); + font-weight: bold; +} + +@font-face { + font-family: "IBM Plex Serif"; + src: url("/fonts/IBMPlexSerif-Italic.ttf"); + font-style: italic; +} + +@font-face { + font-family: "IBM Plex Serif"; + src: url("/fonts/IBMPlexSerif-BoldItalic.ttf"); + font-style: italic; + font-weight: bold; +} + +@font-face { + font-family: "IBM Plex Mono"; + src: url("/fonts/BlexMono.ttf"); +} + diff --git a/static/css/yaroslavps.css b/static/css/yaroslavps.css index c65b2d4..f4f722f 100644 --- a/static/css/yaroslavps.css +++ b/static/css/yaroslavps.css @@ -1,3 +1,5 @@ +@import url("/css/fonts.css"); + html, body { width: 100%; min-height: 100vh; @@ -26,16 +28,7 @@ li, a, p { line-height: 1.3; - font-family: Cantarell, Verdana, sans-serif; -} - -h1, -h2, -h3, -h4, -h5, -h6 { - font-family: Georgia, serif; + font-family: "IBM Plex Sans", Verdana, Helvetica, sans-serif; } a, a:visited { @@ -47,6 +40,25 @@ a:hover { color: #81acc1; } +h1, +h2, +h3, +h4, +h5, +h6, +h1 > a, +h2 > a, +h3 > a, +h4 > a, +h5 > a, +h6 > a { + font-family: "IBM Plex Serif", Georgia, serif; +} + +span.icon { + font-family: "IBM Plex Mono"; +} + .main-container { display: grid; grid-template-columns: 3fr 1fr; @@ -58,3 +70,7 @@ a:hover { grid-column-start: 1; grid-column-end: 3; } + +.sidebar-container { + padding: 1em; +} diff --git a/static/fonts/BlexMono.ttf b/static/fonts/BlexMono.ttf Binary files differnew file mode 100644 index 0000000..2579b49 --- /dev/null +++ b/static/fonts/BlexMono.ttf diff --git a/static/fonts/IBMPlexSans-Bold.ttf b/static/fonts/IBMPlexSans-Bold.ttf Binary files differnew file mode 100644 index 0000000..28cd4a2 --- /dev/null +++ b/static/fonts/IBMPlexSans-Bold.ttf diff --git a/static/fonts/IBMPlexSans-BoldItalic.ttf b/static/fonts/IBMPlexSans-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..147dd86 --- /dev/null +++ b/static/fonts/IBMPlexSans-BoldItalic.ttf diff --git a/static/fonts/IBMPlexSans-Italic.ttf b/static/fonts/IBMPlexSans-Italic.ttf Binary files differnew file mode 100644 index 0000000..044173e --- /dev/null +++ b/static/fonts/IBMPlexSans-Italic.ttf diff --git a/static/fonts/IBMPlexSans-Regular.ttf b/static/fonts/IBMPlexSans-Regular.ttf Binary files differnew file mode 100644 index 0000000..b43625f --- /dev/null +++ b/static/fonts/IBMPlexSans-Regular.ttf diff --git a/static/fonts/IBMPlexSerif-Bold.ttf b/static/fonts/IBMPlexSerif-Bold.ttf Binary files differnew file mode 100644 index 0000000..8a7a786 --- /dev/null +++ b/static/fonts/IBMPlexSerif-Bold.ttf diff --git a/static/fonts/IBMPlexSerif-BoldItalic.ttf b/static/fonts/IBMPlexSerif-BoldItalic.ttf Binary files differnew file mode 100644 index 0000000..1d42cc8 --- /dev/null +++ b/static/fonts/IBMPlexSerif-BoldItalic.ttf diff --git a/static/fonts/IBMPlexSerif-Italic.ttf b/static/fonts/IBMPlexSerif-Italic.ttf Binary files differnew file mode 100644 index 0000000..61d5c1f --- /dev/null +++ b/static/fonts/IBMPlexSerif-Italic.ttf diff --git a/static/fonts/IBMPlexSerif-Regular.ttf b/static/fonts/IBMPlexSerif-Regular.ttf Binary files differnew file mode 100644 index 0000000..aa79e5c --- /dev/null +++ b/static/fonts/IBMPlexSerif-Regular.ttf diff --git a/templates/base.html b/templates/base.html index f03965f..f689bf3 100644 --- a/templates/base.html +++ b/templates/base.html @@ -16,14 +16,14 @@ <h1><a href="/">Yaroslav de la Peña Smirnov</a></h1> </div> {% block page %} - <div class="content-container"> - {% block content %} - {% endblock %} - </div> - <div class="sidebar-container"> - <p>Hello, my name is Yaroslav de la Peña Smirnov. Welcome to my weblog.</p> - <a href="/weblog/archive">Archive</a> - </div> + <div class="content-container"> + {% block content %} + {% endblock %} + </div> + <div class="sidebar-container"> + <p>Hello, my name is Yaroslav de la Peña Smirnov. Welcome to my weblog.</p> + <a href="/weblog/archive">Archive</a> + </div> {% endblock %} </div> </body> diff --git a/templates/index.html b/templates/index.html index 0d9fb7c..4e009e3 100644 --- a/templates/index.html +++ b/templates/index.html @@ -1,5 +1,5 @@ {% extends "base.html" %} {% block page %} -<h2>Welcome to my site!</h2> -<a href="/weblog">Go to weblog</a> + <h2>Welcome to my site!</h2> + <a href="/weblog">Go to weblog</a> {% endblock %} diff --git a/templates/weblog.html b/templates/weblog.html index 11c0d2a..a20f356 100644 --- a/templates/weblog.html +++ b/templates/weblog.html @@ -2,26 +2,26 @@ {% block content %} <div class="posts-list"> {% for post in paginator.pages %} - <div class="post-preview"> - <h2><a href="{{ post.permalink }}">{{ post.title }}</a></h2> - {% if post.summary %} - {{ post.summary | safe }} - {% endif %} - </div> + <div class="post-preview"> + <h2><a href="{{ post.permalink }}">{{ post.title }}</a></h2> + {% if post.summary %} + {{ post.summary | safe }} + {% endif %} + </div> {% endfor %} </div> {% if paginator %} -{% if paginator.number_pagers > 1 %} -<div class="paginator"> - {% if paginator.previous %} - <a href="{{ paginator.first }}">First</a> - <a href="{{ paginator.previous }}">Previous page: {{ paginator.current_index - 1 }}</a> - {% endif %} - {% if paginator.next %} - <a href="{{ paginator.next }}">Next page: {{ paginator.current_index + 1 }}</a> - <a href="{{ paginator.last }}">Last</a> + {% if paginator.number_pagers > 1 %} + <div class="paginator"> + {% if paginator.previous %} + <a href="{{ paginator.first }}">First</a> + <a href="{{ paginator.previous }}">Previous page: {{ paginator.current_index - 1 }}</a> + {% endif %} + {% if paginator.next %} + <a href="{{ paginator.next }}">Next page: {{ paginator.current_index + 1 }}</a> + <a href="{{ paginator.last }}">Last</a> + {% endif %} + </div> {% endif %} -</div> -{% endif %} {% endif %} {% endblock %} |