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

Release 8 (devel -> main) #30

Merged
ChaoticByte merged 8 commits from devel into main 2022-06-16 09:06:19 +00:00
Conversation 3 Commits 8 Files changed 12 +7 -1
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5893d311fe - Show all commits

2
application/app/templates/userPanel.html
View file

@ -17,6 +17,7 @@
<div class="horizontalButtonList"> <div class="horizontalButtonList">
<a class="button" id="navBarBtnHome" href="/">Home</a> <a class="button" id="navBarBtnHome" href="/">Home</a>
<a class="button" id="navBarBtnDeposit" href="/deposit">{% translate "Deposit" %}</a> <a class="button" id="navBarBtnDeposit" href="/deposit">{% translate "Deposit" %}</a>
<a class="button" href="/accounts/logout">{% translate "Logout" %}</a>
<div class="dropDownMenu" id="dropDownMenu"> <div class="dropDownMenu" id="dropDownMenu">
<button class="dropDownButton" id="dropDownMenuButton"> <button class="dropDownButton" id="dropDownMenuButton">
<div>{% translate "Account" %}</div> <div>{% translate "Account" %}</div>
@ -28,7 +29,6 @@
<a class="button dropDownChoice" href="/admin/">Admin Panel</a> <a class="button dropDownChoice" href="/admin/">Admin Panel</a>
{% endif %} {% endif %}
<a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a> <a class="button dropDownChoice" href="/accounts/password_change/">{% translate "Change Password" %}</a>
<a class="button dropDownChoice" href="/accounts/logout">{% translate "Logout" %}</a>
</div> </div>
</div> </div>
</div> </div>

6
static/css/main.css
View file

@ -361,5 +361,11 @@ h1 {
margin-right: 0; margin-right: 0;
margin-left: 0; margin-left: 0;
margin-top: .5rem; margin-top: .5rem;
justify-content: center;
flex-wrap: wrap;
}
.userPanel > .horizontalButtonList > .button,
.userPanel > .horizontalButtonList > .dropDownMenu {
margin: 0.25rem;
} }
} }