diff --git a/sass/_tags.scss b/sass/_tags.scss index ad40ede..e664672 100644 --- a/sass/_tags.scss +++ b/sass/_tags.scss @@ -1,4 +1,4 @@ -span.tag { +.taglist .tag { margin-right:$tag-margin-right; padding:$tag-padding; background:$tag-background; diff --git a/sass/style.scss b/sass/style.scss index c9fa821..260dbc2 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -79,14 +79,29 @@ main { .meta { display: flex; - align-items: center; + align-items: flex-end; flex-wrap: wrap; margin-bottom: 3em; - &>.edit { + .edit { margin-left: auto; font-size: 1.2em; } + + .item { + display: flex; + align-items: baseline; + margin-right: 1.5em; + font-size: .9rem; + font-weight: bold; + color: #333; + cursor: default; + + .icon { + margin-right: .3em; + font-size: 1.2em; + } + } } .taglist { @@ -96,7 +111,13 @@ main { } .pagination { - text-align:center; + display: flex; + align-items: center; + justify-content: center; + + .icon { + margin: 0 1em; + } } section { diff --git a/static/fonts/icons.eot b/static/fonts/icons.eot index 85fc640..0d74643 100644 Binary files a/static/fonts/icons.eot and b/static/fonts/icons.eot differ diff --git a/static/fonts/icons.svg b/static/fonts/icons.svg index 516582d..f952856 100644 --- a/static/fonts/icons.svg +++ b/static/fonts/icons.svg @@ -8,7 +8,12 @@ + + + + + \ No newline at end of file diff --git a/static/fonts/icons.ttf b/static/fonts/icons.ttf index fcd9b74..9b08dd3 100644 Binary files a/static/fonts/icons.ttf and b/static/fonts/icons.ttf differ diff --git a/static/fonts/icons.woff b/static/fonts/icons.woff index a533557..b217571 100644 Binary files a/static/fonts/icons.woff and b/static/fonts/icons.woff differ diff --git a/static/fonts/icons.css b/static/icons.css similarity index 57% rename from static/fonts/icons.css rename to static/icons.css index 76a7121..1cd79a5 100644 --- a/static/fonts/icons.css +++ b/static/icons.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icons'; - src: url('icons.eot?3nfdne'); - src: url('icons.eot?3nfdne#iefix') format('embedded-opentype'), - url('icons.ttf?3nfdne') format('truetype'), - url('icons.woff?3nfdne') format('woff'), - url('icons.svg?3nfdne#icons') format('svg'); + src: url('fonts/icons.eot?zcunvu'); + src: url('fonts/icons.eot?zcunvu#iefix') format('embedded-opentype'), + url('fonts/icons.ttf?zcunvu') format('truetype'), + url('fonts/icons.woff?zcunvu') format('woff'), + url('fonts/icons.svg?zcunvu#icons') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -28,12 +28,27 @@ .icon-pencil:before { content: "\e905"; } +.icon-book:before { + content: "\e91f"; +} +.icon-clock:before { + content: "\e94e"; +} .icon-search:before { content: "\e986"; } +.icon-spoon-knife:before { + content: "\e9a3"; +} .icon-info:before { content: "\ea0c"; } +.icon-arrow-right2:before { + content: "\ea3c"; +} +.icon-arrow-left2:before { + content: "\ea40"; +} .icon-git:before { content: "\eae7"; } diff --git a/templates/index.html b/templates/index.html index 4599fed..35959dd 100644 --- a/templates/index.html +++ b/templates/index.html @@ -6,7 +6,7 @@ {% block title %}{{ config.title }}{% endblock title %} - + diff --git a/templates/macros.html b/templates/macros.html index 6b5e729..0ba4667 100644 --- a/templates/macros.html +++ b/templates/macros.html @@ -26,9 +26,9 @@ {% endmacro print_recipe %} {% macro pagination() %} - {% if paginator.previous %}« Předchozí stránka |{% endif %} + {% if paginator.previous %}{% endif %} {{ paginator.current_index }} / {{ paginator.number_pagers }} - {% if paginator.next %}| Další stránka »{% endif %} + {% if paginator.next %}{% endif %} {% endmacro pagination %} {% macro subnav() %} @@ -50,9 +50,9 @@ {% endmacro recipe_image %} {% macro recipe_meta() %} - {% if page.extra.portions %}Porce: {{ page.extra.portions }}{% endif %} - {% if page.extra.time %}Doba přípravy: {{ page.extra.time }} min{% endif %} - {% if page.extra.source %}Zdroj: {{ page.extra.source }}{% endif %} + {% if page.extra.portions %}{{ page.extra.portions }}{% endif %} + {% if page.extra.time %}{{ page.extra.time }} min{% endif %} + {% if page.extra.source %}{{ page.extra.source }}{% endif %} {% endmacro recipe_meta %}