From dbb6fb0b80b35c1254fbef987e178bc75870d917 Mon Sep 17 00:00:00 2001 From: Emil Miler Date: Thu, 11 Mar 2021 17:14:08 +0100 Subject: [PATCH] =?UTF-8?q?Tla=C4=8D=C3=ADtko=20pro=20editaci=20receptu?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sass/_tags.scss | 2 +- sass/_variables.scss | 2 +- sass/style.scss | 15 ++++++++++++- static/fonts/icons.css | 48 ++++++++++++++++++++++------------------ static/fonts/icons.eot | Bin 0 -> 1944 bytes static/fonts/icons.svg | 3 ++- static/fonts/icons.ttf | Bin 1704 -> 1788 bytes static/fonts/icons.woff | Bin 1780 -> 1864 bytes templates/page.html | 15 +++++++------ 9 files changed, 52 insertions(+), 33 deletions(-) create mode 100644 static/fonts/icons.eot diff --git a/sass/_tags.scss b/sass/_tags.scss index 5a2e650..ad40ede 100644 --- a/sass/_tags.scss +++ b/sass/_tags.scss @@ -1,5 +1,5 @@ span.tag { - margin:$tag-margin; + margin-right:$tag-margin-right; padding:$tag-padding; background:$tag-background; color:$tag-color; diff --git a/sass/_variables.scss b/sass/_variables.scss index 2bef2ff..48dd160 100644 --- a/sass/_variables.scss +++ b/sass/_variables.scss @@ -19,7 +19,7 @@ $anchor-hover-color:lighten($primary, 20%); // tags $tag-background:$secondary; $tag-padding:.5em; -$tag-margin:0 .4em .5em 0; +$tag-margin-right:.4em; $tag-border-radius:5px; $tag-color:#000; $tag-font-size:.9rem; diff --git a/sass/style.scss b/sass/style.scss index 94fefed..a7639f0 100644 --- a/sass/style.scss +++ b/sass/style.scss @@ -75,7 +75,20 @@ main { } .meta { - margin-bottom:1.5em; + display: flex; + align-items: center; + margin-bottom: 1.5em; + + &>.edit { + margin-left: auto; + font-size: 1.2em; + } + } + + .taglist { + display: flex; + align-items: center; + margin-bottom: .5em; } .pagination { diff --git a/static/fonts/icons.css b/static/fonts/icons.css index f76f19f..76a7121 100644 --- a/static/fonts/icons.css +++ b/static/fonts/icons.css @@ -1,35 +1,39 @@ @font-face { - font-family: 'icons'; - src: - url('/fonts/icons.ttf?88dd9o') format('truetype'), - url('/fonts/icons.woff?88dd9o') format('woff'), - url('/fonts/icons.svg?88dd9o#icons') format('svg'); - font-weight: normal; - font-style: normal; - font-display: block; + 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'); + font-weight: normal; + font-style: normal; + font-display: block; } [class^="icon-"], [class*=" icon-"] { - /* use !important to prevent issues with browser extensions that change fonts */ - font-family: 'icons' !important; - speak: never; - font-style: normal; - font-weight: normal; - font-variant: normal; - text-transform: none; - line-height: 1; + /* use !important to prevent issues with browser extensions that change fonts */ + font-family: 'icons' !important; + speak: never; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; - /* Better Font Rendering =========== */ - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; + /* Better Font Rendering =========== */ + -webkit-font-smoothing: antialiased; + -moz-osx-font-smoothing: grayscale; } +.icon-pencil:before { + content: "\e905"; +} .icon-search:before { - content: "\e986"; + content: "\e986"; } .icon-info:before { - content: "\ea0c"; + content: "\ea0c"; } .icon-git:before { - content: "\eae7"; + content: "\eae7"; } diff --git a/static/fonts/icons.eot b/static/fonts/icons.eot new file mode 100644 index 0000000000000000000000000000000000000000..85fc640ebbab52e0d7bccb4b2fac45a55db5f269 GIT binary patch literal 1944 zcmaJ?&2Jk;6n}5mABh9CU9TNTjI;S@Y$?=@9?gj57MA-hwX>0UxN7#?|g14yZp;H_kV+v7kX(i zySj|t0sSNNU5ll)_dHL3{Tcc?k^E{QpIzwJ1}_kqM0~se!uq}Z1N6V3j}(@w*E~cn zBJ)eo)lwywm8$#+^d$7dOWAA7^dh|lJuU3z>{9-x8%wvKmoP_pxw2YCo)F8Xu#+r* zftk%j(kjpI+#NyTHQogO%L)?kXG2^RxEb*CnlNYBkb>GKg;tc=A8D_R!Rx&{F`D`%4{8L zq>@~h>vJdiLkcW*=dRk=O2M+JTaYDY);8onFm`}W5*_ge**eLwD0=_s@R0QoTP<#- z*T=n{NI0Ibcm~+ViTEfF=^n8tQb@!jVco;6=>GE76PMpH7V`OuQ>QYSQ&UABMBvl4 zFgu+0`p@?FnRai)#)DG|WGXlwYr*f_b2>O&JKY-C#Gx^V-}S_2>gzwt(!Mxj3>?e7 z{j$@`6r(q>W6}8Q*tJ(!v5fK1Xv{Sji^PUw5obj1SfjokWBu|0i{!djQ5CP=)HO<_ z>Z#i0i*q*vkehQCFSp{^boz=qIH+Dpr)OKRv~I+El|}~f8cFs2!Oeko=J$mgLy1%B z((cQTxSJNHgEVV=i2~}`Hss~m^PV{fgX2v zP4t0e6SKsPzir_Gp$~*@Yy*bROk)GVjpGQu4ItK|zemTe-+kA9>?!r&gF-edkKcdZ z8-E1utG(+Nar%ER4gdtL7^zjdnwBPoqpy1k&UkT$L2UTPe3YhdImn+u7o&9HGHwQo zuueHdUmJ5VnPF_sE0L9^4J?D7Ft71Vft1^gQZZ=*h3^te$>-C%66G_i!T z@V0?v@G%3MfC~mTqfqo2*aH5ffo&9}kBhlVS=0}s&dlalR*RLg8VXMQe{t#X?@-U@ z7q6DGEA5r4!)K~euBwaqa(*RS%`d2z*3>h(%DGCV9Hc3|j8#cRnaiW>iQ<-}D*6R* XmuL;`89mi=@DznHh}{)8^8xZ76lFmt literal 0 HcmV?d00001 diff --git a/static/fonts/icons.svg b/static/fonts/icons.svg index c01b5d0..516582d 100644 --- a/static/fonts/icons.svg +++ b/static/fonts/icons.svg @@ -3,10 +3,11 @@ Generated by IcoMoon - + + diff --git a/static/fonts/icons.ttf b/static/fonts/icons.ttf index 8074f44466d9f46f4159dcf4f81782e2e51b280d..fcd9b74e1442396b57ecc1c0719d2c5caa29b33d 100644 GIT binary patch delta 691 zcmZ9JKWGzS7{;IPzPn3In_QYEXKgw}sAQ;r+M+gKv9UN7Ek*~I+9Rz^F_#=ohWZC0 z4&oqUIS_Pk76cd3$sw(iqknJ;7;unwaI%ZGJ)cW%sNQkB&+~iU_q*@DdlB7 z;4UOaFBVRW8;Q_Ml6QROi?-!_dGq-jAcpA6OIFQcjnhA14KI~%UN^VDexiR2$fKo2 zYa#6&E&!@Of4W2v+K?aUf6)(@?E0z+^aI)eeWqM3p0kv?ctnsRNZ8h@gD5W3&-e`$ z%U=9=&wff@=1VG0wN~dwdFd@bhm_COnzyHBY2v*7NFcMRZQkGN-TL9}dL9WI{~^Nr zZhB@T^*hA{*bjF_6s~gCYpReJ=bUC+xg_! z&Y!%RsDIx z7k+i`s1u2Bmv=%aEULS%4j!7pTX9@Gq4$4O7?;rPQ`|MZzY)W$4);?n=mDogxDaqj zJ{oA1x)^AUpJ@bIC!Y#*1cO-dk3~H|5@FKS3SzhtXi0v`*Js$I(v*TggURvkfKGls l&=H)(!{uVNQo}NLP(=kb_q{fp-VgrIWBNev{@l&!&R=|IZ|@D7_zImw#6WILNDLAN z8#alL$>91NE$OXV+N53sq}x=&n5f&|I|Gza<~vg~^lSNs znl)%lnX_|MK#=;BI-IuReTHa~6dJcQDota~h94u;_tcS$VJ5cw)i*$;6sxv1Gs{Lf zG#-cuWI4BWx!5&8QH~Nw(0HH7^XiNLLb3X3%+q8|Iuj)SSVWtvt7Q;5TY$ N4Fl6fE1eC^{sOG6b$|c> diff --git a/static/fonts/icons.woff b/static/fonts/icons.woff index 0988eb097c5159fb5109fc51bcd79c1358c653f2..a5335578f856dcc3b24b8c4b5799c892efa147d7 100644 GIT binary patch delta 732 zcmZ9KziSg=9LAsb?%qpH(_U(mD;kFgl_>tKsC6jjC{i4xEv*hN)g#8Fm|r9*RviLT zoJ7zAQ3wA4M^T(4I@M7vP5~nh(hg2`(YELFCWmP6c(~_2&-eTOy8GF;+;88QnwWq9 zuh2R4s;9XD;e9m+9~`h7&of200*E|$L22dXr!P6Trq~MKdjdssg`3yNT7Z5?$zK2b zF`sp>0#enSQcC!HXY+()4&R5BLhtnV`C@&MjI~HA*}!0-oMGLhTq4-1q}9d!qPxh6 ze~yB1md z?r-`&2}k~q2>+Yy+l~0Ic#<6g@ZN~oOYHTV2J|LREQ%NhI&Q~frX^CNXN1uAiPVrt z3H{3W+<@h@o!H36Z$~7x>Gs%`b6Pa@=G=H(!K?Z0D zVX{-l!+^xGz#H_Lz)Nn(3cN|44tyB9QB?>vp<>3R+QxEOey{AAz_`n>W-*&t!F zz1v_iI2-sdPT<~rrd+CFo+~J$gqmlW!|8v)wtOa=TPV0yZZwM=7Wh-TsBWwAmdwf@ D58{#D delta 671 zcmZvZJ4ho@6o&sh&o#y<#-vbD3k!ub;;UI3crqdAMW8I-P zTn{0F9y__2imz>ET&DzxJQLHQ>W+&!XHI&58Gle}$Q71m=v@HXKdI*7lb`vl!ye;+ zH3L#D`@4VgH0fP2?v%1m_4B+tzX+HN(JIvl#0y@Abze+rG)Rdq&2XJXZfvF)cZ7;! zvgo*3dZXNYU1}?BK9sz)(T@SRNc9$2hnKi|6jRS-*|m{;xb$D)d?Z zDi)RNnJJ5{fPQpA|>Yj14)lQ9~!j zOqDfqPO(lNQf!b{B=@tyM3PrlZLpXaR~$hf4rVi+>v~1ZA_EUDUk}B=w>rn(+V9qm YXLEkRDf6pYj^d*L2jzDwgG;OQ4A}8_9RL6T diff --git a/templates/page.html b/templates/page.html index d76c2b1..ae2a962 100644 --- a/templates/page.html +++ b/templates/page.html @@ -16,9 +16,10 @@ {% if page.extra.image %}Náhled{% endif %}
- {% 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 %}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 %} +
{{ page.content | safe }} @@ -27,8 +28,8 @@ {% if page.taxonomies.kategorie %} {% set categories = page.taxonomies.kategorie %} -
- Kategorie – +
+ Kategorie –  {% for term in categories %} {{ term | capitalize() }} {% endfor %} @@ -37,8 +38,8 @@ {% if page.taxonomies.tagy %} {% set tags = page.taxonomies.tagy %} -
- Tagy – +
+ Tagy –  {% for term in tags %} {{ term | capitalize() }} {% endfor %}