mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-25 01:20:35 +00:00
Code Issues Projects Releases Wiki Activity

Adjust layout more

Browse source 
Ensure camera select box is never hidden.
This commit is contained in:
Vivianne Langdon 2022-02-27 00:33:54 -08:00
parent 43f62ef5d7
commit f5c66b5b4a
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bookwyrm/static/css/bookwyrm/components/_barcode.scss
View file

@ -22,6 +22,6 @@
} }
} }
#barcode-status .select { #barcode-camera-list {
float: right; float: right;
} }

2
bookwyrm/static/js/bookwyrm.js
View file

@ -642,7 +642,7 @@ let BookWyrm = new (class {
openBarcodeScanner(event) { openBarcodeScanner(event) {
const scannerNode = document.getElementById("barcode-scanner"); const scannerNode = document.getElementById("barcode-scanner");
const statusNode = document.getElementById("barcode-status"); const statusNode = document.getElementById("barcode-status");
const cameraListNode = document.getElementById("barcode-camera-list"); const cameraListNode = document.querySelector("#barcode-camera-list > select");
cameraListNode.addEventListener('change', onChangeCamera); cameraListNode.addEventListener('change', onChangeCamera);

14
bookwyrm/templates/search/barcode_modal.html
View file

@ -8,9 +8,17 @@
{% endblock %} {% endblock %}
{% block modal-body %} {% block modal-body %}
<div id="barcode-scanner" class="block"></div> <div class="block">
<div id="barcode-scanner"></div>
</div>
<div id="barcode-camera-list" class="select is-small">
<select>
</select>
</div>
<div id="barcode-status" class="block"> <div id="barcode-status" class="block">
<div class="grant-access is-hidden"> <div class="grant-access is-hidden">
<span class="icon icon-lock"></span> <span class="icon icon-lock"></span>
<span class="is-size-5">{% trans "Requesting camera..." %}</span></br> <span class="is-size-5">{% trans "Requesting camera..." %}</span></br>
@ -22,10 +30,6 @@
<span>{% trans "Could not access camera" %}</span> <span>{% trans "Could not access camera" %}</span>
</div> </div>
<div class="scanning is-hidden"> <div class="scanning is-hidden">
<div class="select is-small">
<select id="barcode-camera-list">
</select>
</div>
<span class="icon icon-barcode"></span> <span class="icon icon-barcode"></span>
<span class="is-size-5">{% trans "Scanning..." context "barcode scanner" %}</span><br/> <span class="is-size-5">{% trans "Scanning..." context "barcode scanner" %}</span><br/>
<span>{% trans "Align your book's barcode with the camera." %}</span> <span>{% trans "Align your book's barcode with the camera." %}</span>