Merge branch 'dev'

Co-authored-by: Crowdin Bot <support+bot@crowdin.com>

public/locales/it/common.json

@@ -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",
+        "links": "Collegamenti",
-        "collections": "Collections",
+        "collections": "Raccolte",
         "tags": "Tag"
     },
     "zabbix": {
@@ -957,12 +957,12 @@
         "disaster": "Disaster"
     },
     "lubelogger": {
-        "vehicle": "Vehicle",
+        "vehicle": "Veicolo",
-        "vehicles": "Vehicles",
+        "vehicles": "Veicoli",
         "serviceRecords": "Service Records",
-        "reminders": "Reminders",
+        "reminders": "Promemoria",
-        "nextReminder": "Next Reminder",
+        "nextReminder": "Promemoria Seguente",
-        "none": "None"
+        "none": "Nessuno"
     },
     "vikunja": {
         "projects": "Active Projects",
@@ -1000,7 +1000,7 @@
         "suspended": "Suspended"
     },
     "spoolman": {
-        "loading": "Loading"
+        "loading": "Caricamento"
     },
     "gitlab": {
         "groups": "Groups",

src/components/services/group.jsx

@@ -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" : "";
+  let groupPadding = layout?.header === false ? "px-1" : "p-1 pb-0";
-  if (isSubgroup && layout?.header === false) groupMargin = "-my-3";
-
-  let groupPadding = layout?.header === false ? "px-1" : "p-1";
   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

src/components/services/item.jsx

@@ -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">

src/components/services/list.jsx

@@ -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) => (