Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/OP-17/OrganizationCard-NLDS #329

Merged
merged 1 commit into from
Sep 21, 2023
Merged

feature/OP-17/OrganizationCard-NLDS #329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 4 additions & 14 deletions pwa/src/components/componentCard/ComponentCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,18 @@
.container {
display: flex;
flex-direction: column;
border: var(--web-app-card-border-color);
padding-inline-start: var(--web-app-size-md);
padding-inline-end: var(--web-app-size-md);
padding-block-start: var(--web-app-size-md);
padding-block-end: var(--web-app-size-md);
}

.container > *:not(.titleLink):not(.layerTags):not(:last-child) {
.container > *:not(.title):not(.layerTags):not(:last-child) {
margin-block-end: var(--web-app-size-md);
}

.titleLink {
.title {
font-size: var(--web-app-font-size-lg);
--denhaag-link-icon-gap: var(--web-app-size-xs);
}

.titleLink > :first-child > span > svg {
.title > :first-child > span > svg {
width: var(--web-app-font-size-lg);
height: var(--web-app-font-size-lg);
}

.titleLink > :first-child {
.title > :first-child {
display: flex;
}

Expand Down
4 changes: 2 additions & 2 deletions pwa/src/components/componentCard/ComponentCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ export const ComponentCard: React.FC<ComponentCardProps> = ({ title, layer, cate
});

return (
<CardWrapper>
<CardWrapper className={styles.container}>
<CardHeader>
<CardHeaderTitle>
<div className={styles.titleLink}>
<div className={styles.title}>
<Link onClick={() => navigate(title.href)}>
<Icon className="utrecht-icon--conduction-start">
<IconArrowRight />
Expand Down
8 changes: 0 additions & 8 deletions pwa/src/components/organizationCard/OrganizationCard.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
.container {
border: var(--web-app-card-border-color);
padding-inline-start: var(--web-app-size-md);
padding-inline-end: var(--web-app-size-md);
padding-block-start: var(--web-app-size-md);
padding-block-end: var(--web-app-size-md);
}

.container > *:not(:last-child) {
margin-block-end: var(--web-app-size-md);
}
Expand Down
27 changes: 15 additions & 12 deletions pwa/src/components/organizationCard/OrganizationCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { faBuilding, faGlobe, faHouseLaptop, faRepeat, faUserCog } from "@fortaw
import { GitHubLogo } from "../../assets/svgs/GitHub";
import { GitLabLogo } from "../../assets/svgs/GitLab";
import { TOOLTIP_ID } from "../../layout/Layout";
import { CardHeader, CardHeaderTitle, CardWrapper } from "@conduction/components/lib/components/card";

export interface OrganizationCardProps {
title: {
Expand Down Expand Up @@ -46,17 +47,19 @@ export const OrganizationCard: React.FC<OrganizationCardProps> = ({
const { t } = useTranslation();

return (
<div className={clsx(styles.container, [layoutClassName && layoutClassName])}>
<div className={styles.header}>
<CardWrapper className={clsx([styles.container, layoutClassName && layoutClassName])}>
<CardHeader className={styles.header}>
<div className={styles.headerContent}>
<div className={styles.titleLink}>
<Link to={title.href}>
<Icon className="utrecht-icon--conduction-start">
<IconArrowRight />
</Icon>
{title.label}
</Link>
</div>
<CardHeaderTitle>
<div className={styles.titleLink}>
<Link to={title.href}>
<Icon className="utrecht-icon--conduction-start">
<IconArrowRight />
</Icon>
{title.label}
</Link>
</div>
</CardHeaderTitle>

<Paragraph className={styles.description}>{description}</Paragraph>
</div>
Expand All @@ -66,7 +69,7 @@ export const OrganizationCard: React.FC<OrganizationCardProps> = ({
<img className={styles.logo} onClick={() => navigate(title.href)} src={logo} />
</div>
)}
</div>
</CardHeader>

<div className={styles.tagsContainer}>
<DataBadge
Expand Down Expand Up @@ -127,6 +130,6 @@ export const OrganizationCard: React.FC<OrganizationCardProps> = ({
</DataBadge>
)}
</div>
</div>
</CardWrapper>
);
};
4 changes: 2 additions & 2 deletions pwa/src/context/filters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ export interface IFilters {
}

export const baseFilters = {
resultDisplayLayout: "table",
resultDisplayLayout: "cards",
dependenciesDisplayLayout: "layer",
landingDisplayLayout: "cards",
catagoryDisplayLayout: "table",
organizationsResultDisplayLayout: "table",
organizationsResultDisplayLayout: "cards",
currentPage: 1,
applicationsCurrentPage: 1,
organizationCurrentPage: 1,
Expand Down
8 changes: 1 addition & 7 deletions pwa/static/themes/rotterdam.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,13 +376,6 @@
--utrecht-button-group-inline-gap: var(--rotterdam-space-scale-3);
--utrecht-action-activate-cursor: pointer;

/* @gemeente-denhaag: Breadcrumb */
--denhaag-breadcrumb-color: var(--rotterdam-color-green);
--denhaag-breadcrumb-current-color: var(--rotterdam-color-gray-tint-09);

--utrecht-color-sample-border-radius: 4px;
--utrecht-button-icon-gap: var(--rotterdam-space-scale-1);

/* @gemeente-utrecht: table */
--utrecht-table-border-width: 0;
--utrecht-table-row-hover-background-color: var(--rotterdam-color-base-gray);
Expand All @@ -397,6 +390,7 @@

/* @gemeente-utrecht: radio button */
--utrecht-radio-button-size: inherit;
--utrecht-button-icon-gap: var(--web-app-size-xs);

/* @gemeente-utrecht: link */
--utrecht-link-visited-color: inherit;
Expand Down
6 changes: 0 additions & 6 deletions pwa/static/themes/theme.css.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,6 @@

--utrecht-button-group-inline-gap: var(--rotterdam-space-scale-3);
--utrecht-action-activate-cursor: pointer;

/* @gemeente-denhaag: Breadcrumb */
--denhaag-breadcrumb-color: var(--rotterdam-color-green);
--denhaag-breadcrumb-current-color: var(--rotterdam-color-gray-tint-09);

--utrecht-color-sample-border-radius: 4px;
--utrecht-button-icon-gap: var(--rotterdam-space-scale-1);

/* @gemeente-utrecht: table */
Expand Down
11 changes: 3 additions & 8 deletions pwa/static/themes/utrecht.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,8 @@
/* --conduction-card-header-date-font-weight: 400; */
/* --conduction-card-header-date-font-size: 16px; */
/* --conduction-card-header-date-color: #404b4f; */
/* --conduction-card-header-title-color: var(--rotterdam-color-green); */
/* --conduction-card-header-color: var(--web-app-color-white); */
--conduction-card-header-title-color: hsl(211 60% 35%);
--conduction-card-header-color: var(--web-app-color-white);

/* @gemeent-denhaag: SideNav */
--web-app-sidenav-link-active-color: var(--web-app-color-link-active);
Expand Down Expand Up @@ -369,12 +369,6 @@
--utrecht-button-group-inline-gap: inherit;
--utrecht-action-activate-cursor: inherit;

/* @gemeente-denhaag: Breadcrumb */
--denhaag-breadcrumb-color: inherit;
--denhaag-breadcrumb-current-color: inherit;

--utrecht-color-sample-border-radius: inherit;
--utrecht-button-icon-gap: var(--web-app-size-xs);

/* @gemeente-utrecht: table */
--utrecht-table-border-width: inherit;
Expand All @@ -390,6 +384,7 @@

/* @gemeente-utrecht: radio button */
--utrecht-radio-button-size: var(--web-app-size-md);
--utrecht-button-icon-gap: var(--web-app-size-xs);

/* @gemeente-utrecht: link */
--utrecht-link-visited-color: inherit;
Expand Down
Loading