Skip to content

Commit

Permalink
Merge branch 'master' into python_den_scoreboard
Browse files Browse the repository at this point in the history
  • Loading branch information
faucomte97 authored Sep 6, 2024
2 parents 7b699d1 + 0bdd773 commit 03cbf6a
Show file tree
Hide file tree
Showing 6 changed files with 144 additions and 127 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

<!--next-version-placeholder-->

## v6.4.5 (2024-09-06)

### Fix

* Using the browser's back arrow reopens intro popup ([#1725](https://github.com/ocadotechnology/rapid-router/issues/1725)) ([`b23d08c`](https://github.com/ocadotechnology/rapid-router/commit/b23d08cf9f767f7d0b5967eb58b098a5f0b03b17))

## v6.4.4 (2024-09-05)

### Fix
Expand Down
243 changes: 123 additions & 120 deletions Pipfile.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion game/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "6.4.4"
__version__ = "6.4.5"
14 changes: 11 additions & 3 deletions game/static/game/js/drawing.js
Original file line number Diff line number Diff line change
Expand Up @@ -1167,11 +1167,19 @@ ocargo.Drawing.startPopup = function (
$("#modal-buttons").html(buttonDiv)
}
// Show popup
$("#myModal").show()
$("#ocargo-modal").show()
window.location.hash = 'myModal'
$("#myModal").addClass("show");
$("#ocargo-modal").addClass("show");
}

var hideModal = function() {
$("#myModal").removeClass("show");
$("#ocargo-modal").removeClass("show");
}

$("#close-modal").on('click', function() {
hideModal();
})

// This is the function that starts the pop-up with a yes and a no button
ocargo.Drawing.startYesNoPopup = function (
title,
Expand Down
4 changes: 2 additions & 2 deletions game/static/game/sass/game.scss
Original file line number Diff line number Diff line change
Expand Up @@ -351,13 +351,13 @@
cursor: pointer;
}

#myModal:not(:target) {
#myModal {
opacity: 0;
visibility: hidden;
transition: opacity 0.4s ease, visibility 0.4s ease-in-out;
}

#myModal:target {
#myModal.show {
opacity: 1;
visibility: visible;
transition: opacity 0.4s ease, visibility 0.4s ease-in-out;
Expand Down
2 changes: 1 addition & 1 deletion game/templates/game/basenonav.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h2 id="myModal-title" class="ocargo-modal-title"></h2>
<span>Close</span>
</button>
</div>
<a class="close-reveal-modal" id="close-modal" href="#">&#215;</a>
<a class="close-reveal-modal" id="close-modal" href="javascript:void(0);">&#215;</a>
</div>
</div>
</div>
Expand Down

0 comments on commit 03cbf6a

Please sign in to comment.