diff --git a/_includes/overview.html b/_includes/overview.html index cf6282ed9bbeb6503923218603dfe1e65d2ffadd..ad0d5a906c63605a27d2e47841e4a2ccbf3128f3 100644 --- a/_includes/overview.html +++ b/_includes/overview.html @@ -69,8 +69,8 @@ {% capture price %}{% if price_ex != "" %}{{price_ex}}{% else %}{{ o.price-source }}{% endif %}{% endcapture %} <div class="orderlist-price"><font class="faircoin-price">{{ o.price-per-unit | divided_by: price | round:1 | decimals }} FAIR</font><br>{% if min-size > 0 %}{{ min-size }}..{% endif %}{{ max-size }} {{ o.unit }}{% if site.data.price-sources[priceref] %}<br>( {{ o.price-per-unit | decimals }} {{ site.data.price-sources[priceref].currency }} / {{ o.unit }} )<br>( {{ price }} {{ site.data.price-sources[priceref].currency }} / FAIR )<br><i>{% if price_ex != "" %}<a href="{{ site.data.price-sources[o.price-source].www }}">{{ o.price-source | replace: '-','/' }}</a>{% else %}fixed price{% endif %}</i>{% else %}<br><br><br>{% endif %} - <div class="qrcode d-none"> - <div onclick="$(this).parent().toggleClass('d-none')" id="qrcode_{{ peer[0] }}_{{ hid }}" data-price="{{ o.price-per-unit | divided_by: price | round:1 | decimals }}" class=""></div> + <div class="qrcode invisble"> + <div onclick="$(this).parent().toggleClass('invisble')" id="qrcode_{{ peer[0] }}_{{ hid }}" data-price="{{ o.price-per-unit | divided_by: price | round:1 | decimals }}" class=""></div> </div> </div> </div> @@ -83,30 +83,6 @@ </div> -<style> -.qrcode { - position: relative; - width: 0px; - height: 0px; - right: 200px; - top: -85px; - z-index: 200; -} - -.qrcode > div { - z-index: 201; - height: 150px; - width: 150px; - background: white; - border: 20px solid white; -} - -.qrcode.d-none { - z-index: 0; -} - -</style> - <script> function createQRCode(qrcode){ @@ -126,8 +102,8 @@ function createQRCode(qrcode){ window[qrcode].makeCode(url); // make another code. } - $('.qrcode').toggleClass('d-none',true); - $('#'+qrcode).parent().toggleClass('d-none'); + $('.qrcode').toggleClass('invisble',true); + $('#'+qrcode).parent().toggleClass('invisble'); } diff --git a/_plugins/array.rb b/_plugins/array.rb index da4f1db2718d349a045424ddecc1154a4ca1bfe8..2786b8e8a4e17a396f0942bdfaeb6c2f26b660fc 100644 --- a/_plugins/array.rb +++ b/_plugins/array.rb @@ -20,7 +20,11 @@ module Arrays def objectsize(input) c=0 for a in input - c+=a[1].length + for aa in a[1] + if aa['test'] != true + c+=1 + end + end end c end diff --git a/css/main.scss b/css/main.scss index caf884b27e709757bac978953110a509cd7fd85e..6ba5d3724f87b71a85cbeb4786b3f2c934fa0dd8 100644 --- a/css/main.scss +++ b/css/main.scss @@ -443,3 +443,27 @@ bid { .user-address { cursor: pointer; } + +.qrcode { + position: relative; + width: 0px; + height: 0px; + right: 200px; + top: -85px; + z-index: 200; + opacity: 1; + transition: opacity 0.4s 0s ease-out; +} + +.qrcode > div { + z-index: 201; + height: 150px; + width: 150px; + background: white; + border: 20px solid white; +} + +.qrcode.invisble { + z-index: 0; + opacity: 0; +}