Skip to content

Commit 83b74b9

Browse files
BenGlutBenGlut
authored
Merge pull request #46 from Ptitlouis6012/feat/hex-code-in-details
feat: move the colour hex code into the product details, under Colour
2 parents 2024ff8 + 9ca55d9 commit 83b74b9

13 files changed

Lines changed: 17 additions & 4 deletions

File tree

‎renderer/css/70-detail-misc.css‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
.icon-book { -webkit-mask-image: url('../../assets/svg/icons/icon_book.svg'); mask-image: url('../../assets/svg/icons/icon_book.svg'); }
7070
.icon-list { -webkit-mask-image: url('../../assets/svg/icons/icon_list.svg'); mask-image: url('../../assets/svg/icons/icon_list.svg'); }
7171
.icon-palette { -webkit-mask-image: url('../../assets/svg/icons/icon_palette.svg'); mask-image: url('../../assets/svg/icons/icon_palette.svg'); }
72+
.icon-pipette { -webkit-mask-image: url('../../assets/svg/icons/icon_pipette.svg'); mask-image: url('../../assets/svg/icons/icon_pipette.svg'); }
7273
.icon-apple { -webkit-mask-image: url('../../assets/svg/icons/icon_apple.svg'); mask-image: url('../../assets/svg/icons/icon_apple.svg'); }
7374
.icon-android { -webkit-mask-image: url('../../assets/svg/icons/icon_android.svg'); mask-image: url('../../assets/svg/icons/icon_android.svg'); }
7475
.icon-package { -webkit-mask-image: url('../../assets/svg/icons/icon_package.svg'); mask-image: url('../../assets/svg/icons/icon_package.svg'); }
@@ -3777,9 +3778,10 @@
37773778
.ro-det-k { color: var(--muted); }
37783779
.ro-det-v { color: var(--text); font-weight: 600; text-align: right; display: inline-flex; align-items: center; gap: 6px; justify-content: flex-end; min-width: 0; }
37793780
.ro-det-v.is-low { color: var(--danger); }
3780-
/* Second chip row: the colour(s) as HEX, each with its dot. */
3781-
.ro-hex-chips { margin-top: -2px; }
3782-
.aspect-chip--hex { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 11.5px; gap: 6px; }
3781+
/* Colour(s) as plain HEX text, one per line under "Colour" in the details card
3782+
(the colour itself is already shown by the dot on the Colour row). */
3783+
.ro-hex-list { display: flex; flex-direction: column; align-items: flex-end; gap: 2px; }
3784+
.ro-hex-val { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 11.5px; }
37833785
.ro-det-v .pv-link { color: var(--primary); text-decoration: none; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
37843786
.ro-det-v .pv-link:hover { text-decoration: underline; }
37853787
.ro-color-dot { width: 12px; height: 12px; border-radius: 50%; flex-shrink: 0; box-shadow: 0 0 0 1px rgba(255,255,255,.15); }

‎renderer/inventory.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18975,7 +18975,6 @@ import { jobBar, jobBarFill } from './printers/job-bar.js';
1897518975
${row1Parts.length ? `<div class="pi-row1">${row1Parts.join(" · ")}</div>` : ""}
1897618976
${name2 ? `<div class="pi-row2 pi-row2--name">${esc(name2)}</div>` : ""}
1897718977
<div class="aspect-chips pc-ident-chips">${badgeHtml}${weightChip}</div>
18978-
${hexList.length ? `<div class="aspect-chips pc-ident-chips ro-hex-chips">${hexList.map(h => `<span class="aspect-chip aspect-chip--hex"><span class="ro-color-dot" style="background:${esc(h.length === 9 ? h.slice(0, 7) : h)}"></span>${esc(h)}</span>`).join("")}</div>` : ""}
1897918978
${desc ? `<p class="ro-hero-desc">${esc(desc)}</p>` : ""}
1898018979
<div class="ro-kpis">
1898118980
<div class="ro-kpi" id="roStock">
@@ -19060,6 +19059,7 @@ import { jobBar, jobBarFill } from './printers/job-bar.js';
1906019059
${detRow("list", t("roDetRange"), val(d.series))}
1906119060
${detRow("droplets", t("detMaterial"), val(d.material))}
1906219061
${detRow("palette", t("roDetColor"), val(d.colorName) ? `${colorDot}${val(d.colorName)}` : "")}
19062+
${detRow("pipette", t("roDetHex"), hexList.length ? `<span class="ro-hex-list">${hexList.map(h => `<span class="ro-hex-val">${esc(h)}</span>`).join("")}</span>` : "")}
1906319063
${detRow("scale", t("roDetNetWeight"), esc(capTxt))}
1906419064
${detRow("tag", t("detProductId"), pid ? extLink(`https://tigersystem.io/fr/catalog/${pid}`, pid) : "")}
1906519065
${detRow("package", t("detType"), val(d.productType))}

‎renderer/locales/de.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Produktdetails",
15271527
"roDetRange": "Serie",
15281528
"roDetColor": "Farbe",
1529+
"roDetHex": "Hex-Code",
15291530
"roDetNetWeight": "Nettogewicht",
15301531
"roPanelStock": "Bestand",
15311532
"roPanelSlicer": "Slicer-Profile",

‎renderer/locales/en.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Product details",
15271527
"roDetRange": "Range",
15281528
"roDetColor": "Colour",
1529+
"roDetHex": "Hex code",
15291530
"roDetNetWeight": "Net weight",
15301531
"roPanelStock": "Stock",
15311532
"roPanelSlicer": "Slicer profiles",

‎renderer/locales/es.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Detalles del producto",
15271527
"roDetRange": "Gama",
15281528
"roDetColor": "Color",
1529+
"roDetHex": "Código hex",
15291530
"roDetNetWeight": "Peso neto",
15301531
"roPanelStock": "Gestión de stock",
15311532
"roPanelSlicer": "Perfiles del laminador",

‎renderer/locales/fr.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Détails produit",
15271527
"roDetRange": "Gamme",
15281528
"roDetColor": "Coloris",
1529+
"roDetHex": "Code hex",
15291530
"roDetNetWeight": "Poids net",
15301531
"roPanelStock": "Gestion stock",
15311532
"roPanelSlicer": "Profils slicer",

‎renderer/locales/it.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Dettagli prodotto",
15271527
"roDetRange": "Gamma",
15281528
"roDetColor": "Colore",
1529+
"roDetHex": "Codice hex",
15291530
"roDetNetWeight": "Peso netto",
15301531
"roPanelStock": "Gestione scorte",
15311532
"roPanelSlicer": "Profili slicer",

‎renderer/locales/nl.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Productdetails",
15271527
"roDetRange": "Serie",
15281528
"roDetColor": "Kleur",
1529+
"roDetHex": "Hex-code",
15291530
"roDetNetWeight": "Nettogewicht",
15301531
"roPanelStock": "Voorraadbeheer",
15311532
"roPanelSlicer": "Slicerprofielen",

‎renderer/locales/pl.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1525,6 +1525,7 @@
15251525
"roPanelDetails": "Szczegóły produktu",
15261526
"roDetRange": "Seria",
15271527
"roDetColor": "Kolor",
1528+
"roDetHex": "Kod hex",
15281529
"roDetNetWeight": "Waga netto",
15291530
"roPanelStock": "Zapasy",
15301531
"roPanelSlicer": "Profile slicera",

‎renderer/locales/pt-pt.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,7 @@
15261526
"roPanelDetails": "Detalhes do produto",
15271527
"roDetRange": "Gama",
15281528
"roDetColor": "Cor",
1529+
"roDetHex": "Código hex",
15291530
"roDetNetWeight": "Peso líquido",
15301531
"roPanelStock": "Gestão de stock",
15311532
"roPanelSlicer": "Perfis do slicer",

0 commit comments

Comments
 (0)