forked from s3lph/matemat
Merge branch 'staging' into 'master'
Release 0.2.12 See merge request s3lph/matemat!81
This commit is contained in:
commit
b4deda7778
6 changed files with 34 additions and 28 deletions
14
CHANGELOG.md
14
CHANGELOG.md
|
@ -1,5 +1,19 @@
|
|||
# Matemat Changelog
|
||||
|
||||
<!-- BEGIN RELEASE v0.2.12 -->
|
||||
## Version 0.2.12
|
||||
|
||||
Bugfix release
|
||||
|
||||
### Changes
|
||||
|
||||
<!-- BEGIN CHANGES 0.2.12 -->
|
||||
- Fix layout issues in transfer/deposit entry form
|
||||
- Add missing email field in signup form
|
||||
<!-- END CHANGES 0.2.12 -->
|
||||
|
||||
<!-- END RELEASE v0.2.12-->
|
||||
|
||||
<!-- BEGIN RELEASE v0.2.11 -->
|
||||
## Version 0.2.11
|
||||
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
|
||||
__version__ = '0.2.11'
|
||||
__version__ = '0.2.12'
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
Package: matemat
|
||||
Version: 0.2.11
|
||||
Version: 0.2.12
|
||||
Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
|
||||
Section: web
|
||||
Priority: optional
|
||||
|
|
|
@ -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;
|
||||
}
|
|
@ -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);
|
||||
|
|
|
@ -18,6 +18,9 @@
|
|||
<label for="signup-password2"><b>Repeat password</b>: </label>
|
||||
<input id="signup-password2" type="password" name="password2" required="required"/><br/>
|
||||
|
||||
<label for="signup-email">E-Mail: </label>
|
||||
<input id="signup-email" type="text" name="email"/><br/>
|
||||
|
||||
<label for="signup-avatar">Upload a profile picture: </label>
|
||||
<input id="signup-avatar" type="file" name="avatar" accept="image/*" /><br/>
|
||||
|
||||
|
|
Loading…
Reference in a new issue