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.

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/BEHEER-2948/Lansingerland-theme #189

Merged
merged 2 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

- **Version 2.2 (breaking changes from 2.1.x)**

- 2.2.51:
- Added text-decoration tokens to CardHeader.
- Added label color tokens to checkbox.
- Added font-weight, gap, padding and hover box-shadow tokens to PrimaryTopNav.
- 2.2.50:
- Added transition and box-shadow to CardWrapper.
- Added font-style to CardHeader.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@conduction/components",
"version": "2.2.50",
"version": "2.2.51",
"description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)",
"main": "lib/index.js",
"scripts": {
Expand Down
9 changes: 9 additions & 0 deletions src/components/card/cardHeader/CardHeader.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
/* --conduction-card-header-hover-border-bottom-style: unset; */
/* --conduction-card-header-hover-border-bottom-color: unset; */
--conduction-card-header-title-color: #000000;
/* --conduction-card-header-title-text-decoration: none; */
/* --conduction-card-header-title-text-underline-offset: 2px; */
/* --conduction-card-header-title-hover-color: #000000; */
/* --conduction-card-header-title-hover-text-decoration: none; */
/* --conduction-card-header-title-hover-text-underline-offset: 2px; */

--conduction-card-header-date-color: #000000;
--conduction-card-header-date-font-size: 16px;
--conduction-card-header-date-font-weight: 100;
Expand All @@ -28,10 +33,14 @@

.title > * {
color: var(--conduction-card-header-title-color) !important;
text-decoration: var(--conduction-card-header-title-text-decoration) !important;
text-underline-offset: var(--conduction-card-header-title-text-underline-offset) !important;
}

.title:hover > * {
color: var(--conduction-card-header-title-hover-color, var(--conduction-card-header-title-color)) !important;
text-decoration: var(--conduction-card-header-title-hover-text-decoration, var(--conduction-card-header-title-text-decoration)) !important;
text-underline-offset: var(--conduction-card-header-title-hover-text-underline-offset, var(--conduction-card-header-title-text-underline-offset)) !important;
}

.date {
Expand Down
4 changes: 4 additions & 0 deletions src/components/formFields/checkbox/Checkbox.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@
box-sizing: border-box;
}

.checkbox:hover + label {
color: var(--conduction-input-checkbox-label-hover-color, var(--conduction-input-checkbox-label-color, var(--utrecht-document-color)));

}
.checkbox:hover + label::before {
content: " ";
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion src/components/formFields/select/select.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export type TSelectOption = { label: string; value: string };
export type TGroupedSelectOption = { label: string; options: TSelectOption[] };

interface ISelectProps {
control: Control<FieldValues, any>;
control: Control<any, any>;
options: TSelectOption[] | TGroupedSelectOption[];
name: string;
ariaLabel: string;
Expand Down
20 changes: 19 additions & 1 deletion src/components/topNav/primaryTopNav/PrimaryTopNav.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,21 @@
/* --conduction-primary-top-nav-dropdown-hover-color: #4376fc; */
/* --conduction-primary-top-nav-dropdown-hover-background-color: #ffffff; */
/* --conduction-primary-top-nav-dropdown-hover-box-shadow: inset 0 -4px black; */

/* --conduction-primary-top-nav-container-padding-block-end: 18px; */
/* --conduction-primary-top-nav-container-padding-block-start: 18px; */
/* --conduction-primary-top-nav-container-padding-inline-end: 18px; */
/* --conduction-primary-top-nav-container-padding-inline-start: 18px; */

/* --conduction-primary-top-nav-list-gap: var(--skeleton-size-2x); */
}

.container {
width: 100%;
padding-block-end: var(--conduction-primary-top-nav-container-padding-block-end);
padding-block-start: var(--conduction-primary-top-nav-container-padding-block-start);
padding-inline-end: var(--conduction-primary-top-nav-container-padding-inline-end);
padding-inline-start: var(--conduction-primary-top-nav-container-padding-inline-start);
}

.menuToggleContainer {
Expand Down Expand Up @@ -80,6 +91,7 @@
border-color: var(--conduction-primary-top-nav-list-border-color);
border-style: var(--conduction-primary-top-nav-list-border-style);
border-width: var(--conduction-primary-top-nav-list-border-width);
gap: var(--conduction-primary-top-nav-list-gap);
}

.li {
Expand Down Expand Up @@ -108,7 +120,7 @@
}

.current:hover {
box-shadow: var(--conduction-primary-top-nav-current-box-shadow);
box-shadow: var(--conduction-primary-top-nav-current-hover-box-shadow, var(--conduction-primary-top-nav-current-box-shadow));
}

.current:hover > .currentLink {
Expand Down Expand Up @@ -224,6 +236,7 @@

.dropdown > li {
padding-inline-start: 18px;
font-weight: var(--conduction-primary-top-nav-dropdown-font-weight);
}

.toggleIcon {
Expand Down Expand Up @@ -252,6 +265,11 @@
z-index: 1;
}

:not(.dropdown) .li.current:hover {
box-shadow: var(--conduction-primary-top-nav-current-hover-box-shadow, var(--conduction-primary-top-nav-current-box-shadow));
font-weight: var(--conduction-primary-top-nav-current-hover-font-weight, var(--conduction-primary-top-nav-current-font-weight));
}

@media only screen and (min-width: 992px) {
.container {
width: fit-content;
Expand Down
Loading