Compare commits

..

5 Commits

Author SHA1 Message Date
shamoon
cc9b4782f2 Merge branch 'dev'
Some checks failed
Docker / Linting Checks (push) Has been cancelled
Docker / Docker Build & Push (push) Has been cancelled
2024-12-24 22:20:20 -08:00
github-actions[bot]
14cda38dbb New Crowdin translations by GitHub Action (#4481)
Some checks are pending
Docker / Linting Checks (push) Waiting to run
Docker / Docker Build & Push (push) Blocked by required conditions
Co-authored-by: Crowdin Bot <support+bot@crowdin.com>
2024-12-24 22:19:23 -08:00
shamoon
27e3c9f1ed Merge branch 'dev' 2024-12-24 22:18:55 -08:00
shamoon
607c4b7750 Fix: fun with padding and margins (#4489)
Some checks are pending
Docker / Linting Checks (push) Waiting to run
Docker / Docker Build & Push (push) Blocked by required conditions
2024-12-24 12:22:06 -08:00
shamoon
1c6480586c Fix: fix search overlay behind status indicators in 0.10.x (#4484)
Some checks are pending
Docker / Linting Checks (push) Waiting to run
Docker / Docker Build & Push (push) Blocked by required conditions
2024-12-23 18:28:04 -08:00
4 changed files with 19 additions and 21 deletions

View File

@@ -335,7 +335,7 @@
},
"technitium": {
"totalQueries": "Richieste",
"totalNoError": "Success",
"totalNoError": "Successo",
"totalServerFailure": "Failures",
"totalNxDomain": "NX Domains",
"totalRefused": "Refused",
@@ -590,7 +590,7 @@
"total": "Totale"
},
"peanut": {
"battery_charge": "Battery Charge",
"battery_charge": "Carica Batteria",
"ups_load": "Carico UPS",
"ups_status": "Stato UPS",
"online": "Online",
@@ -854,7 +854,7 @@
},
"romm": {
"platforms": "Piattaforme",
"totalRoms": "Games",
"totalRoms": "Giochi",
"saves": "Saves",
"states": "States",
"screenshots": "Screenshots",
@@ -890,7 +890,7 @@
"sceneDuration": "Durata Delle Scene",
"images": "Immagini",
"imageSize": "Dimensioni immagine",
"galleries": "Galleries",
"galleries": "Gallerie",
"performers": "Esecutori",
"studios": "Studi",
"movies": "Film",
@@ -933,7 +933,7 @@
},
"stocks": {
"stocks": "Stocks",
"loading": "Loading",
"loading": "Caricamento",
"open": "Open - US Market",
"closed": "Closed - US Market",
"invalidConfiguration": "Invalid Configuration"
@@ -944,8 +944,8 @@
"version": "Versione"
},
"linkwarden": {
"links": "Links",
"collections": "Collections",
"links": "Collegamenti",
"collections": "Raccolte",
"tags": "Tag"
},
"zabbix": {
@@ -957,12 +957,12 @@
"disaster": "Disaster"
},
"lubelogger": {
"vehicle": "Vehicle",
"vehicles": "Vehicles",
"vehicle": "Veicolo",
"vehicles": "Veicoli",
"serviceRecords": "Service Records",
"reminders": "Reminders",
"nextReminder": "Next Reminder",
"none": "None"
"reminders": "Promemoria",
"nextReminder": "Promemoria Seguente",
"none": "Nessuno"
},
"vikunja": {
"projects": "Active Projects",
@@ -1000,7 +1000,7 @@
"suspended": "Suspended"
},
"spoolman": {
"loading": "Loading"
"loading": "Caricamento"
},
"gitlab": {
"groups": "Groups",

View File

@@ -23,10 +23,7 @@ export default function ServicesGroup({
if (layout?.initiallyCollapsed ?? groupsInitiallyCollapsed) panel.current.style.height = `0`;
}, [layout, groupsInitiallyCollapsed]);
let groupMargin = layout?.header === false ? "-my-1" : "";
if (isSubgroup && layout?.header === false) groupMargin = "-my-3";
let groupPadding = layout?.header === false ? "px-1" : "p-1";
let groupPadding = layout?.header === false ? "px-1" : "p-1 pb-0";
if (isSubgroup) groupPadding = "";
return (
@@ -36,7 +33,6 @@ export default function ServicesGroup({
"services-group flex-1",
layout?.style === "row" ? "basis-full" : "basis-full md:basis-1/2 lg:basis-1/3 xl:basis-1/4",
layout?.style !== "row" && fiveColumns ? "3xl:basis-1/5" : "",
groupMargin,
groupPadding,
isSubgroup ? "subgroup" : "",
)}
@@ -89,6 +85,7 @@ export default function ServicesGroup({
services={group.services}
layout={layout}
useEqualHeights={useEqualHeights}
header={layout?.header !== false}
/>
{group.groups?.length > 0 && (
<div

View File

@@ -86,7 +86,7 @@ export default function Item({ service, groupName, useEqualHeights }) {
<div
className={`absolute top-0 right-0 flex flex-row justify-end ${
statusStyle === "dot" ? "gap-0" : "gap-2 mr-2"
} z-30 service-tags`}
} z-10 service-tags`}
>
{service.ping && (
<div className="flex-shrink-0 flex items-center justify-center service-tag service-ping">

View File

@@ -4,12 +4,13 @@ import { columnMap } from "../../utils/layout/columns";
import Item from "components/services/item";
export default function List({ groupName, services, layout, useEqualHeights }) {
export default function List({ groupName, services, layout, useEqualHeights, header }) {
return (
<ul
className={classNames(
layout?.style === "row" ? `grid ${columnMap[layout?.columns]} gap-x-2` : "flex flex-col",
"mt-3 services-list",
header ? "mt-3" : "",
"services-list",
)}
>
{services.map((service) => (