From 65a7374519a252198050e54aa324cdb01bb525c3 Mon Sep 17 00:00:00 2001 From: koksnuss Date: Sun, 17 May 2020 20:31:06 +0200 Subject: [PATCH 1/2] wip --- coinmanager/db.sqlite3 | Bin 241664 -> 245760 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/coinmanager/db.sqlite3 b/coinmanager/db.sqlite3 index 933719500e0450942ab90cba493f365e7bd1c997..5ca26823e3ae853d8bf27c0362a560fb6131aa39 100644 GIT binary patch delta 4418 zcmchZYitzP6~}jGJag|I&tvUfjE%v2y*6MTHtV%bXk!Qv9>F1kI6#bug4glbEZA$Z z4+2uFA=*iWnyLjg(hx-~GFJbIzH2XZuxU`*w9_IltHA@igzk4={TVwtrd2H1sc@H88(`sS|eg zgUt-n4k7e_JK!ex99#vLz-e$2ybs<52f&-)Rj?cE1UtZXuoY|u8$df~11rHpU_O`w zLZAjH|(#CB+G zn0h_+5cOHq>!{aKpGkcN_36~7QLmvsmHHIwlc`tRuCrD2LXdhTbxb`#y@L8A>JzD# zQ=dS+jCv{c@zhJGkE8Afu zT8CDn6=)fH5Y0vRp?Wj}O-2D!hI~jy05R};_)mBP{vG}mUWOOpM{pSa3BG47v*#9b zM9_K8!?F!T!$j+ehKSB0T1T{&=uDzBh)yRujc5(gsYIs`olLZvXcf^Q(MqD2Xn@x< z%U6&elZZ|vT26EV(K4c?M8^{?Av%tzpQw*$G0`HTUZN^dg{VwaB3ejP_sUQLl2`xR*z?+S*Qk8N++Z)X}#1YJu01bv0NMF!nP-=J&gQ*;rXMuX^>xDR&0^{~y{6Jb}Ch(Dm8qgJ%m znz7%Z-=NpgD`+=r?_c1(&Fcckus*iIwyLWOl&*inMaFd>GB4rY`s z9w^zwUVlO1)aw@KX;$y5x7F+YMcc2aT%!>fxUF(ttap39VAad&A5>FKs4LZ4RaE|_ ze5mYIbma-{ZV>J+9s`$8l~dG8-=F|-zt2v@P6@@ zHTZ9fJH#$)?1Q4mny;hiMf8ld6NQm#&Gkw6EPN6Mz`wukb8qOxCl3oD`&rD&#?#DU$UFn zhuFz1%UofOGA}Y)n8%n9BYVEswZN}qBjB}aP$XAEC|jo{v??$NPIqYGP&iZ@YO1Yo z!bZgy$X}euq&#F8xR8l?$Pmz7O!*j$E13y-$gn%#vN4d4ocWg8h@SJ^(JIWx4 zpoj6CbQZW68>-jC(4n!JPG`3*L~$eGJVf^Dt}tRABe}!yE+k+SdOgUIjEmS{h((zh zf40o-HhHE&@JWYOuZKdoC9)x|;bpO;7LP@e(Y{!uM~mYn@kmOGB_rK4@gtFVRKqL# zHfuf67*54H@v=muCxW*`Vt7$hOC(3%mEt)DBIUcEEQRP&A9rYrSJ$>il8MdnCQ-I4nlQ!sn(H-ClgjicuQXlFYil56L?`f67A`6 zysTifV34%0(=m~aL2L+Fq0ygMgc86%4{9hqk5dkz`-AL24hyt zYG^q)v-->NEr{c4$ra zn%R2%aBtKqu!h%Y@uXGq?wk^thvsrsOBbbkNRZVzK?cEv4y{#-^=*l2@l>oEcWMc| zAlcU&P4yI!)S^Zg)doeTG zogjCAX$+bl&gQywPaxe&$!y0(=PrZOkLJW8z4ki^Um(5G9VF~T0_hbwLCDz^wh}V; z-^azRY#+}3Gm~u?SOv@0p)oixcMg|iU!Tuy4$0QB=a*YOa?Zc$gMVO3SWR)&@R z%FmQeWub!Q|Hzl+Bl2!JCAaoh;-G9Do(=9b#LTvmU8Bi|jj$VGGo$K2>hlq65Oa`# z5u!-8pgcIE=Q06fmK$N6Z%>6$m-oIpjkc70-{^obGl$U0JI}k3894|cSm%C> zjp<~T<;v{CSSO6*Lm*&Ga|iLeiJE(dM>a~>oyk;pkWMFojVWVf;`j;(7?bmZP(ruA uj{-)u8wor2w}4UQCU`dybQ7$Tz(ys_HT$8~V4V(*24Vxd84Gbd&wl~ZP8N>< delta 947 zcmZwETS!zv7zgl~GoEv1=G<0YQWW>9jmN>$SY3AQEa|B9SDfVqzMlk>*Rdae^*H zs0HI&6k+txgRF5N9|93-lcLPqJ|z31K`wSPv<;-ALF`fIVPIx{{Q16byk5;4RQnS7 zIsia^zkU?f4L2+ugveK!VHQV$b?oqo9T56jJNNOvDn}6B>+2ScxE?dE2ZpX#fCNnO z8)VR2{|-k5i+G_K_zm~B2&LAe5yfx=H%->*4;rG2G{{23FeA2z=1~tlK=)FeCQv6; zDP}#5T$7W8C?sL>lPr*VGE3eQKN(};My@7?+@=9ykWn&1o{=H)fDHOd9K9khAjrAc z&2t=M)>)@`ZT*7eA?e(q3qTTDMlCc{GQ*tWKy; z)f;NFS|VpFf0Q}pxiX+!R4SD;1v4PB>F(_GLzyf;AGyjhb)$9%IUOmJ zjZ+Q)ZDGyg$4J56T3N1S2c?+WVe}FX6{C*7_hIE5 From 24365d2834c8c7004472497367d764bdffdcfe60 Mon Sep 17 00:00:00 2001 From: koksnuss Date: Sun, 17 May 2020 20:34:38 +0200 Subject: [PATCH 2/2] #27 part fix: fix sticky table head issues and minor other things --- coinmanager/coinc/static/coinc/styles.css | 97 ++++++++++--------- .../coinc/templates/coinc/country.html | 9 +- coinmanager/coinc/views.py | 2 +- 3 files changed, 59 insertions(+), 49 deletions(-) diff --git a/coinmanager/coinc/static/coinc/styles.css b/coinmanager/coinc/static/coinc/styles.css index d5bb193..2beb09c 100644 --- a/coinmanager/coinc/static/coinc/styles.css +++ b/coinmanager/coinc/static/coinc/styles.css @@ -38,7 +38,7 @@ a, a:hover, a:active, a:visited { - text-decoration: none; + text-decoration: none !important; color: black !important; cursor: pointer; vertical-align: inherit; @@ -190,7 +190,6 @@ thead > tr:first-child > th { thead > tr:nth-child(2) > th { background-color: white; top: 40px; - border-bottom: 1px solid gray; } tr:nth-child(2) > th:nth-child(10):after, @@ -206,28 +205,33 @@ tr:nth-child(2) > th:nth-child(12):after { } tr:nth-child(2) > th:nth-child(10):after { - content: '201'; + content: '2 €*'; } tr:nth-child(2) > th:nth-child(11):after { - content: '202'; + content: '2 €*'; } tr:nth-child(2) > th:nth-child(12):after { - content: '203'; + content: '2 €*'; } -tr:nth-child(2):after { - content: ''; - position: absolute; - bottom: 0; +tbody > tr:first-child > td { + border-top: 4px solid white; +} + +thead > tr:nth-child(3) { + height: 1.2px; +} + +thead > tr:nth-child(3) > th { + background-color: #636263; left: 0; - width: 100%; - height: 1px; - border-bottom: 1.2px solid gray; + top: 80px; + padding: 0; + box-shadow: 0 3px 10px black; } - /* table body */ thead > tr:nth-child(2) > th, @@ -246,8 +250,8 @@ td > * { td.coin { background-color: #cec6ca; - border: 1px solid gray; font-size: 1.1rem; + border: 2px solid white; } .brass { @@ -275,8 +279,7 @@ td.coin { } .noexist { - border: 0 !important; - background: rgba(0, 0, 0, 0) !important; + background: rgba(74, 63, 85, 0.43) !important; } @@ -355,14 +358,42 @@ div.two_lines { /* smallest view 12 * 28 = 336px */ @media (max-width: 480px) { + body { + font-size: 0.86rem; + } + + button.navbar_toggler { + display: block; + float: right + } + div#buttons { + display: none; + } + table { width: 336px; + table-layout: fixed; } - tr:nth-child(2) > th { - width: 26px; + tr { + height: 28px; } - tr:nth-child(2) > th:after { - width: 26px; + thead > tr:first-child { + height: 35px; + font-size: 1rem; + } + thead > tr:nth-child(2) > th { + top: 35px; + width: 28px; + } + thead > tr:nth-child(3) > th { + top: 63px; + } + tr:nth-child(2) > th:nth-child(10):after, + tr:nth-child(2) > th:nth-child(11):after, + tr:nth-child(2) > th:nth-child(12):after { + height: 28px; + width: 28px; + line-height: 28px; } tbody > tr > td > div.coin { height: 26px; @@ -372,30 +403,7 @@ div.two_lines { div.found { height: 26px; width: 26px; - } - tr { - height: 26px; - } - tr:nth-child(2) > th:nth-child(10):after, - tr:nth-child(2) > th:nth-child(11):after, - tr:nth-child(2) > th:nth-child(12):after { - height: 26px; - width: 26px; - line-height: 26px; - } - thead > tr:nth-child(2) > th, - tbody > tr > td { - font-size: 0.8rem; - } - thead > tr:nth-child(2) > th { - top: 36px; - } - button.navbar_toggler { - display: block; - float: right - } - div#buttons { - display: none; + clip-path: polygon(100% 60%, 100% 100%, 60% 100%); } } @@ -461,4 +469,3 @@ div.two_lines { display: block; } } - diff --git a/coinmanager/coinc/templates/coinc/country.html b/coinmanager/coinc/templates/coinc/country.html index 3eee0ac..d498bf3 100644 --- a/coinmanager/coinc/templates/coinc/country.html +++ b/coinmanager/coinc/templates/coinc/country.html @@ -13,19 +13,22 @@ - + Jahr 1 2 5 10 20 50 - 100 - 200 + 1 € + 2 € + + + {% for year in country.years %}{% show_year country year %}{% endfor %} diff --git a/coinmanager/coinc/views.py b/coinmanager/coinc/views.py index b3d7ddd..4b0660f 100644 --- a/coinmanager/coinc/views.py +++ b/coinmanager/coinc/views.py @@ -178,7 +178,7 @@ def show_coin(country, year, stamp, value): name = coin.name if coin.name else '' special_class = '' if name: - if len(name) >= 26 and len(name) <= 52: + if len(name) >= 18 and len(name) <= 52: special_class = 'two_lines' elif len(name) > 53: special_class = 'three_lines'