From ed2eb036ae9e2ebacf701f78f887a1bc34cbf21d Mon Sep 17 00:00:00 2001
From: Priec
diff --git a/assets/views/admin/catalog/category_form.html b/assets/views/admin/catalog/category_form.html
index 4be7bfb..b1e1113 100644
--- a/assets/views/admin/catalog/category_form.html
+++ b/assets/views/admin/catalog/category_form.html
@@ -9,7 +9,7 @@
{% if category %}{{ t(key="edit-category", lang=lang | default(value='sk')) }}{% else %}{{ t(key="new-category", lang=lang | default(value='sk')) }}{% endif %}
- {{ ui::button(variant="outline-secondary", label=t(key="cancel", lang=lang | default(value='sk')), href="/admin/catalog/categories", pad="px-3 py-2") }}
+ {{ ui::button(variant="outline-secondary", label=t(key="cancel", lang=lang | default(value='sk')), href="/admin/catalog/categories", size="px-3 py-2 text-sm") }}
{{ t(key="order-manual-fulfillment", lang=lang | default(value='sk')) }}
diff --git a/assets/views/home/index.html b/assets/views/home/index.html index 2ffb798..32f8006 100644 --- a/assets/views/home/index.html +++ b/assets/views/home/index.html @@ -1,4 +1,5 @@ {% extends "base.html" %} +{% import "macros/ui.html" as ui %} {% block title %}{{ t(key="brand", lang=lang | default(value='sk')) }}{% endblock title %} diff --git a/assets/views/macros/ui.html b/assets/views/macros/ui.html index 168d5f6..a85fee2 100644 --- a/assets/views/macros/ui.html +++ b/assets/views/macros/ui.html @@ -9,7 +9,7 @@ {{ ui::button(label=t(key="save", lang=lang)) }} {# default primary #} {{ ui::button(label="Add", attrs='hx-post="/x"' | safe) }} {{ ui::button(label="Cancel", variant="outline-secondary", href="/back") }} - {{ ui::button(label="Send", pad="px-6 py-2.5") }} {# keep a non-default size #} + {{ ui::button(label="Send", size="px-6 py-2.5 text-sm") }} {# keep a non-default size #} {{ ui::badge(label="Published", variant="success") }} Notes: @@ -29,7 +29,7 @@ outline : outline-primary | outline-secondary | outline-alternate | outline-danger ghost : ghost-primary | ghost-secondary | ghost-danger #} -{% macro button(label, variant="primary", type="button", href="", attrs="", extra="", pad="px-4 py-2") -%} +{% macro button(label, variant="primary", type="button", href="", attrs="", extra="", icon="", size="px-4 py-2 text-sm") -%} {%- if variant == "secondary" -%}{% set cls = "border border-secondary bg-secondary text-on-secondary focus-visible:outline-secondary dark:border-secondary-dark dark:bg-secondary-dark dark:text-on-secondary-dark dark:focus-visible:outline-secondary-dark" -%} {%- elif variant == "danger" -%}{% set cls = "border border-danger bg-danger text-on-danger focus-visible:outline-danger dark:bg-danger dark:border-danger dark:text-on-danger dark:focus-visible:outline-danger" -%} {%- elif variant == "success" -%}{% set cls = "border border-success bg-success text-on-success focus-visible:outline-success dark:bg-success dark:border-success dark:text-on-success dark:focus-visible:outline-success" -%} @@ -44,9 +44,22 @@ {%- elif variant == "ghost-danger" -%}{% set cls = "bg-transparent text-danger focus-visible:outline-danger dark:text-danger dark:focus-visible:outline-danger" -%} {%- else -%}{% set cls = "border border-primary bg-primary text-on-primary focus-visible:outline-primary dark:border-primary-dark dark:bg-primary-dark dark:text-on-primary-dark dark:focus-visible:outline-primary-dark" -%} {%- endif -%} -{% if href %}{{ label }}{% if href %}a{% else %}button{% endif %}> +{% if href %}{{ icon | safe }}{{ label }}{% if href %}a{% else %}button{% endif %}> {%- endmacro button %} +{# Icon-only button (square). Penguin ghost treatment (bg-transparent, + hover:opacity-75); pass the raw