diff --git a/files/assets/css/main.css b/files/assets/css/main.css index ac79b15e7..6bffa1040 100644 --- a/files/assets/css/main.css +++ b/files/assets/css/main.css @@ -6820,6 +6820,10 @@ div.markdown { .bug { pointer-events: none !important; + position: absolute; + top: 0; + left: 0; + z-index: 9999999; } @media (min-width: 768px) { diff --git a/files/assets/js/spider-with-bugs.js b/files/assets/js/spider-with-bugs.js index 24cc34293..0b0584432 100644 --- a/files/assets/js/spider-with-bugs.js +++ b/files/assets/js/spider-with-bugs.js @@ -1,5 +1,7 @@ "use strict"; +const awards_container = document.getElementById('awards-container') + // offsets for spider distance to bug const XOFFSET = 25; const YOFFSET = 37; @@ -630,14 +632,9 @@ var Bug = { bug.style.background = 'transparent url(' + this.options.imageSprite + ') no-repeat 0 ' + row; bug.style.width = this.options.bugWidth + 'px'; bug.style.height = this.options.bugHeight + 'px'; - bug.style.position = 'fixed'; - bug.style.top = 0; - bug.style.left = 0; - bug.style.zIndex = '9999999'; this.bug = bug; this.setPos(); - } }, @@ -684,7 +681,7 @@ var Bug = { } if (!this.inserted) { this.inserted = true; - document.body.appendChild(this.bug); + awards_container.appendChild(this.bug); } }, diff --git a/files/assets/js/vendor/critters.js b/files/assets/js/vendor/critters.js index b91ccaea1..9f687deda 100644 --- a/files/assets/js/vendor/critters.js +++ b/files/assets/js/vendor/critters.js @@ -29,6 +29,7 @@ */ "use strict"; +const awards_container = document.getElementById('awards-container') var startStationaryToggle = Date.now() + 10000; @@ -550,14 +551,9 @@ var Bug = { bug.style.background = 'transparent url(' + this.options.imageSprite + ') no-repeat 0 ' + row; bug.style.width = this.options.bugWidth + 'px'; bug.style.height = this.options.bugHeight + 'px'; - bug.style.position = 'fixed'; - bug.style.top = 0; - bug.style.left = 0; - bug.style.zIndex = '9999999'; this.bug = bug; this.setPos(); - } }, @@ -601,7 +597,7 @@ var Bug = { } if (!this.inserted) { this.inserted = true; - document.body.appendChild(this.bug); + awards_container.appendChild(this.bug); } }, diff --git a/files/templates/awards.html b/files/templates/awards.html index e484114be..e49997bbd 100644 --- a/files/templates/awards.html +++ b/files/templates/awards.html @@ -39,18 +39,4 @@ {% endfor %} {% endif %} -{% if p.award_count("shit", v) %} - {% if v and v.spider %} - - {% else %} - - {% endif %} - -{% endif %} - -{% if p.award_count("fireflies", v) %} - - -{% endif %} - diff --git a/files/templates/default.html b/files/templates/default.html index 5693544c8..ad5bdede5 100644 --- a/files/templates/default.html +++ b/files/templates/default.html @@ -112,10 +112,29 @@ -{% if not err and v and v.spider %} - {% if not (p and p.award_count("shit", v)) %} - + +{% if p %} + {% if p.award_count("shit", v) or p.award_count("fireflies", v) %} + {% if p.award_count("shit", v) and v and v.spider %} + + {% else %} + + {% endif %} {% endif %} + + {% if p.award_count("shit", v) %} + + {% endif %} + + {% if p.award_count("fireflies", v) %} + + {% endif %} + + {% if v and v.spider %} + + {% endif %} +{% elif v and v.spider %} + {% endif %}