Merge branch 'staging' into 'master'

Release 0.2.9

See merge request s3lph/matemat!78
This commit is contained in:
s3lph 2021-08-07 19:11:53 +00:00
commit 1ad96edf03
6 changed files with 26 additions and 4 deletions

View file

@ -1,5 +1,18 @@
# Matemat Changelog # Matemat Changelog
<!-- BEGIN RELEASE v0.2.9 -->
## Version 0.2.9
Enhancement
### Changes
<!-- BEGIN CHANGES 0.2.9 -->
- Enhancement: Disable text selection and prevent image dragging for better touchscreen support
<!-- END CHANGES 0.2.9 -->
<!-- END RELEASE v0.2.9 -->
<!-- BEGIN RELEASE v0.2.8 --> <!-- BEGIN RELEASE v0.2.8 -->
## Version 0.2.8 ## Version 0.2.8

View file

@ -1,2 +1,2 @@
__version__ = '0.2.8' __version__ = '0.2.9'

View file

@ -1,5 +1,5 @@
Package: matemat Package: matemat
Version: 0.2.8 Version: 0.2.9
Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol> Maintainer: s3lph <account-gitlab-ideynizv@kernelpanic.lol>
Section: web Section: web
Priority: optional Priority: optional

View file

@ -1,3 +1,12 @@
* {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
.thumblist-item { .thumblist-item {
display: inline-block; display: inline-block;
margin: 5px; margin: 5px;

View file

@ -59,7 +59,7 @@
</span><br/> </span><br/>
{% endif %} {% endif %}
<div class="imgcontainer"> <div class="imgcontainer">
<img src="/static/upload/thumbnails/products/{{ product.id }}.png" alt="Picture of {{ product.name }}"/> <img src="/static/upload/thumbnails/products/{{ product.id }}.png" alt="Picture of {{ product.name }}" draggable="false"/>
{% set pstock = stock.get_stock(product) %} {% set pstock = stock.get_stock(product) %}
{% if pstock is not none %} {% if pstock is not none %}
<span class="thumblist-stock">{{ pstock }}</span> <span class="thumblist-stock">{{ pstock }}</span>

View file

@ -14,7 +14,7 @@
<a href="/touchkey?uid={{ user.id }}&username={{ user.name }}"> <a href="/touchkey?uid={{ user.id }}&username={{ user.name }}">
<span class="thumblist-title">{{ user.name }}</span><br/> <span class="thumblist-title">{{ user.name }}</span><br/>
<div class="imgcontainer"> <div class="imgcontainer">
<img src="/static/upload/thumbnails/users/{{ user.id }}.png" alt="Avatar of {{ user.name }}"/> <img src="/static/upload/thumbnails/users/{{ user.id }}.png" alt="Avatar of {{ user.name }}" draggable="false"/>
</div> </div>
</a> </a>
</div> </div>