From d23f72aa881340ba6401438ad9b467a41c71e5f5 Mon Sep 17 00:00:00 2001 From: Walter Date: Mon, 17 Feb 2025 10:03:50 +0100 Subject: [PATCH] More css changes --- app/bloonsa_game/models.py | 2 +- .../static/bloonsa_game/css/levelinfo.css | 18 +++++------ .../bloonsa_game/img/ads/banner160x600.png | Bin 5345 -> 8883 bytes .../static/bloonsa_game/js/flash_handler.js | 19 +++++++----- .../templates/bloonsa_game/base.html | 28 +++++------------- .../templates/bloonsa_game/game.html | 26 ++++++++-------- .../bloonsa_game/modules/levelinfo.html | 20 +++++++++---- app/requirements.txt | 1 - 8 files changed, 57 insertions(+), 57 deletions(-) diff --git a/app/bloonsa_game/models.py b/app/bloonsa_game/models.py index b145a00..7942264 100644 --- a/app/bloonsa_game/models.py +++ b/app/bloonsa_game/models.py @@ -42,7 +42,7 @@ class Level(models.Model): @property def stars(self): result = list(self.bloonsa_level_ratings.aggregate(Avg("rating")).values())[0] - return 0 if result is None else math.floor(result) + return 0 if result is None else math.ceil(result) def __str__(self): diff --git a/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css b/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css index 9b3565a..907d77e 100644 --- a/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css +++ b/app/bloonsa_game/static/bloonsa_game/css/levelinfo.css @@ -66,6 +66,10 @@ color: #F1F125; } +.clear-color { + color: lime; +} + .level-star-img { height: 14px; width: 14px; @@ -79,17 +83,11 @@ vertical-align: bottom; } -.level-wins-img, .level-glitches-img { - filter: invert(75%) sepia(23%) saturate(6404%) hue-rotate(355deg) brightness(98%) contrast(107%) !important; // orange -} -.level-plays-img { - filter: invert(17%) sepia(2%) saturate(72%) hue-rotate(66deg) brightness(94%) contrast(89%); // grey -} -.level-pops-img { +.filter-red { filter: invert(61%) sepia(72%) saturate(7291%) hue-rotate(338deg) brightness(108%) contrast(101%); // red } -.level-darts-img { - filter: invert(0%) sepia(96%) saturate(15%) hue-rotate(246deg) brightness(105%) contrast(105%); // black +.filter-grey { + filter: invert(17%) sepia(2%) saturate(72%) hue-rotate(66deg) brightness(94%) contrast(89%); // grey } .filter-black { filter: invert(0%) sepia(96%) saturate(15%) hue-rotate(246deg) brightness(105%) contrast(105%); // black @@ -99,4 +97,4 @@ } .filter-orange { filter: invert(75%) sepia(23%) saturate(6404%) hue-rotate(355deg) brightness(98%) contrast(107%) !important; // orange -} +} \ No newline at end of file diff --git a/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png b/app/bloonsa_game/static/bloonsa_game/img/ads/banner160x600.png index d725f7207974f9973f3f526eae9260fe5779564a..f24c50bb2504d0935401b0f567ec829af1cf7402 100644 GIT binary patch literal 8883 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 diff --git a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js index decc110..42b1a56 100644 --- a/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js +++ b/app/bloonsa_game/static/bloonsa_game/js/flash_handler.js @@ -64,9 +64,9 @@ function bloonsa_update_html(r) { document.getElementById("level-pb-darts-glitch").textContent = r.score_dart_glitch ? "+1": ""; if (r.score_dart_glitch) { - darts_img.classList.add("level-glitches-img"); + darts_img.classList.add("filter-orange"); } else { - darts_img.classList.remove("level-glitches-img"); + darts_img.classList.remove("filter-orange"); } } else { @@ -74,13 +74,18 @@ function bloonsa_update_html(r) { document.getElementById("level-target").textContent = r.level_target; document.getElementById("level-pb-darts-number").textContent = "-"; document.getElementById("level-pb-darts-glitch").textContent = ""; - darts_img.classList.remove("level-glitches-img"); + darts_img.classList.remove("filter-orange"); } - - - - //if (r.level_cleared) { + if (r.level_cleared) { + document.getElementById("level-pb-pops-number").classList.add("clear-color"); + document.getElementById("level-pb-pops-separator").classList.add("clear-color"); + document.getElementById("level-target").classList.add("clear-color"); + } else { + document.getElementById("level-pb-pops-number").classList.remove("clear-color"); + document.getElementById("level-pb-pops-separator").classList.remove("clear-color"); + document.getElementById("level-target").classList.remove("clear-color"); + } // Profile diff --git a/app/bloonsa_game/templates/bloonsa_game/base.html b/app/bloonsa_game/templates/bloonsa_game/base.html index 7a7cc73..b89bd20 100644 --- a/app/bloonsa_game/templates/bloonsa_game/base.html +++ b/app/bloonsa_game/templates/bloonsa_game/base.html @@ -25,39 +25,23 @@ - - - - {% if head %} - {{ head }} - {% endif %} + {% block head %}{% endblock head %}

- +
- {% if user.is_authenticated %} {% include 'bloonsa_game/modules/profilebox.html' %} {% else %} {% include 'bloonsa_game/modules/loginbox.html' %} {% endif %} -
@@ -71,14 +55,15 @@
- + -->
diff --git a/app/bloonsa_game/templates/bloonsa_game/game.html b/app/bloonsa_game/templates/bloonsa_game/game.html index a524554..5bdd7e0 100644 --- a/app/bloonsa_game/templates/bloonsa_game/game.html +++ b/app/bloonsa_game/templates/bloonsa_game/game.html @@ -6,21 +6,23 @@ {% endblock title %} {% block head %} + + + {% endblock head %} {% block content %} - -
+