diff --git a/core/static/core/style.scss b/core/static/core/style.scss index 486964bc..cf1cedc6 100644 --- a/core/static/core/style.scss +++ b/core/static/core/style.scss @@ -1249,63 +1249,6 @@ u, text-decoration: underline; } -#bar-ui { - padding: 0.4em; - display: flex; - flex-wrap: wrap; - flex-direction: row-reverse; - - .quantity { - display: inline-block; - min-width: 1.2em; - text-align: center; - } - - .remove-item { - float: right; - } - - .basket-error-container { - position: relative; - display: block - } - - .basket-error { - z-index: 10; // to get on top of tomselect - text-align: center; - position: absolute; - } - - - #products { - flex-basis: 100%; - margin: 0.2em; - overflow: auto; - } - - #click_form { - flex: auto; - margin: 0.2em; - width: 20%; - } - - #user_info { - flex: auto; - padding: 0.5em; - margin: 0.2em; - height: 100%; - background: $secondary-neutral-light-color; - - img { - max-width: 70%; - } - - input { - background: white; - } - } -} - /*-----------------------------USER PROFILE----------------------------*/ .user_mini_profile { diff --git a/counter/static/bundled/counter/counter-click-index.ts b/counter/static/bundled/counter/counter-click-index.ts index 23a8105d..7ab8de1d 100644 --- a/counter/static/bundled/counter/counter-click-index.ts +++ b/counter/static/bundled/counter/counter-click-index.ts @@ -146,7 +146,7 @@ exportToHtml("loadCounter", (config: CounterConfig) => { $(() => { /* Accordion UI between basket and refills */ // biome-ignore lint/suspicious/noExplicitAny: dealing with legacy jquery - ($("#click_form") as any).accordion({ + ($("#click-form") as any).accordion({ heightStyle: "content", activate: () => $(".focus").focus(), }); diff --git a/counter/static/counter/css/counter-click.scss b/counter/static/counter/css/counter-click.scss new file mode 100644 index 00000000..c715867a --- /dev/null +++ b/counter/static/counter/css/counter-click.scss @@ -0,0 +1,62 @@ +@import "core/static/core/colors"; + +.quantity { + display: inline-block; + min-width: 1.2em; + text-align: center; +} + +.remove-item { + float: right; +} + +.basket-error-container { + position: relative; + display: block +} + +.basket-error { + z-index: 10; // to get on top of tomselect + text-align: center; + position: absolute; +} + + +#bar-ui { + padding: 0.4em; + display: flex; + flex-wrap: wrap; + flex-direction: row-reverse; +} + +#products { + flex-basis: 100%; + margin: 0.2em; + overflow: auto; +} + +#click-form { + flex: auto; + margin: 0.2em; + width: 20%; + + ul { + list-style-type: none; + } +} + +#user_info { + flex: auto; + padding: 0.5em; + margin: 0.2em; + height: 100%; + background: $secondary-neutral-light-color; + + img { + max-width: 70%; + } + + input { + background: white; + } +} \ No newline at end of file diff --git a/counter/templates/counter/counter_click.jinja b/counter/templates/counter/counter_click.jinja index e902a3c8..e2ad8562 100644 --- a/counter/templates/counter/counter_click.jinja +++ b/counter/templates/counter/counter_click.jinja @@ -6,6 +6,7 @@ {% endblock %} {% block additional_css %} + @@ -24,7 +25,7 @@ {% endblock %} {% block content %} -

{{ counter }}

+

{{ counter }}

-
+
{% trans %}Selling{% endtrans %}
{% set counter_click_url = url('counter:click', counter_id=counter.id, user_id=customer.user_id) %} @@ -92,28 +93,47 @@
{{ form.management_form }}
-
    {% trans %}This basket is empty{% endtrans %}
- +

Total: @@ -122,8 +142,18 @@

- - + +