diff --git a/CHANGELOG.md b/CHANGELOG.md index 4cf2c3a..06e1b4a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,19 @@ # Matemat Changelog + +## Version 0.2.12 + +Bugfix release + +### Changes + + +- Fix layout issues in transfer/deposit entry form +- Add missing email field in signup form + + + + ## Version 0.2.11 diff --git a/matemat/__init__.py b/matemat/__init__.py index b890880..3d84215 100644 --- a/matemat/__init__.py +++ b/matemat/__init__.py @@ -1,2 +1,2 @@ -__version__ = '0.2.11' +__version__ = '0.2.12' diff --git a/package/debian/matemat/DEBIAN/control b/package/debian/matemat/DEBIAN/control index 94ff7e6..a988eeb 100644 --- a/package/debian/matemat/DEBIAN/control +++ b/package/debian/matemat/DEBIAN/control @@ -1,5 +1,5 @@ Package: matemat -Version: 0.2.11 +Version: 0.2.12 Maintainer: s3lph Section: web Priority: optional diff --git a/static/css/matemat.css b/static/css/matemat.css index e9d89fe..3b38c84 100644 --- a/static/css/matemat.css +++ b/static/css/matemat.css @@ -202,32 +202,25 @@ } #transfer-userlist { - display: grid; + display: none; + flex-direction: column; + column-gap: 10px; + padding: 0; + margin: 0; grid-column: 4; grid-row-start: 1; grid-row-end: 6; - grid-template-columns: 200px; - grid-template-rows: 25px 1fr 25px; - column-gap: 10px; - row-gap: 10px; - padding: 0; - margin: 0; } #transfer-userlist.show { - display: block; - position: relative; + display: flex; } #transfer-userlist-list { margin: 10px 0; padding: 0; overflow-y: hidden; - max-height: calc(100% - 150px); - top: 45px; - bottom: 45px; - grid-row: 2; - grid-column: 1; + flex-grow: 1; } #transfer-userlist-list > li { @@ -247,7 +240,6 @@ right: 0; height: 25px; text-align: center; - display: block; background: #f0f0f0; padding: 20px; font-family: sans-serif; @@ -255,17 +247,6 @@ font-size: 25px; } -#transfer-userlist > #scroll-up{ - grid-row: 1; - grid-column: 1; - top: 0; -} -#transfer-userlist > #scroll-down { - grid-row: 2; - grid-column: 1; - bottom: 0; -} - #transfer-userlist-list > li.active { background: #60f060; } \ No newline at end of file diff --git a/static/js/depositlist.js b/static/js/depositlist.js index 2a2a16f..af31f0e 100644 --- a/static/js/depositlist.js +++ b/static/js/depositlist.js @@ -95,11 +95,19 @@ deposit_key = (k) => { deposit = '0'; product_id = null; target_user = null; + if (target_user_li != null) { + target_user_li.classList.remove('active'); + } input.classList.remove('show'); userlist.classList.remove('show'); } else if (k == 'del') { if (deposit == '0') { product_id = null; + target_user = null; + if (target_user_li != null) { + target_user_li.classList.remove('active'); + } + userlist.classList.remove('show'); input.classList.remove('show'); } deposit = deposit.substr(0, deposit.length - 1); diff --git a/templates/signup.html b/templates/signup.html index f829769..f3371c7 100644 --- a/templates/signup.html +++ b/templates/signup.html @@ -18,6 +18,9 @@
+ +
+