ChaoticByte/drinks-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases 20 Packages Wiki Activity Actions

Release 10 (devel -> main) #32

Merged
ChaoticByte merged 4 commits from devel into main 2022-06-29 18:14:16 +00:00
Conversation 2 Commits 4 Files changed 4 +11 -8
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
application/app/templates/registration/login.html
View file

@ -71,12 +71,12 @@
{% if user_.first_name %} {% if user_.first_name %}
{{ user_.first_name }}
{% if user_.last_name %} {% if user_.last_name %}
{{ user_.last_name }} {{ user_.last_name }},
{% endif %} {% endif %}
{{ user_.first_name }}
{% else %} {% else %}
{{ user_.username }} {{ user_.username }}
{% endif %} {% endif %}

2
lib/env.sh
View file

@ -2,5 +2,5 @@
export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt" export DJANGO_SK_ABS_FP="$(pwd)/config/secret_key.txt"
export STATIC_FILES="$(pwd)/static/" export STATIC_FILES="$(pwd)/static/"
export APP_VERSION="9" export APP_VERSION="10"
export PYTHONPATH="$(pwd)/packages/" export PYTHONPATH="$(pwd)/packages/"

7
static/css/login.css
View file

@ -70,9 +70,12 @@ form input[type="password"], form input[type="text"] {
font-size: 1rem; font-size: 1rem;
margin: .1rem 0; margin: .1rem 0;
} }
form .horizontalButtonList {
margin-top: 1.5rem;
}
.pinpad { .pinpad {
margin-top: 3rem; margin-top: 1.5rem;
margin-bottom: 2rem; margin-bottom: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;

4
static/js/login.js
View file

@ -1,4 +1,4 @@
{ (() => {
// Define variables // Define variables
@ -84,4 +84,4 @@
} }
} }
} })()