Karl/homepage
1
0
Fork 0
mirror of https://github.com/karl0ss/homepage.git synced 2025-04-29 12:03:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
shamoon 2024-12-24 22:18:55 -08:00
commit 27e3c9f1ed
No known key found for this signature in database
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/services/group.jsx
View File

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

2
src/components/services/item.jsx
View File

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

5
src/components/services/list.jsx
View File

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