Skip to content

Commit

Permalink
Merge pull request #183 from ConductionNL/development
Browse files Browse the repository at this point in the history
Development to main, week 10
  • Loading branch information
remko48 authored Mar 11, 2024
2 parents 1b2ae47 + 4ff2f85 commit fba3daf
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

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

- 2.2.46 / 2.2.47: Fixed minor css parse error.
- 2.2.45: Updated Pagination and select to ensure more WCAG compliancy.
- 2.2.44: Updated PrimaryTopNav to allow font-weight.
- 2.2.43: Updated DownloadCard to allow size as string.
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.45",
"version": "2.2.47",
"description": "React (Gatsby) components used within the Conduction Skeleton Application (and its implementations)",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/container/Container.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@
width: 100%;
margin-inline: auto;
box-sizing: border-box;
padding-inline: var(--conduction-container-padding-inline);
padding-inline: var(--conduction-container-padding-inline, unset);
max-width: var(--conduction-container-max-width);
}
2 changes: 1 addition & 1 deletion src/components/tabs/Tabs.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
--conduction-tabs-tab-padding-inline-start: var(--skeleton-size-sm);
--conduction-tabs-tab-padding-inline-end: var(--skeleton-size-sm);
/* --conduction-tabs-tab-margin-inline-end: var(--skeleton-size-xs); */
--conduction-tabs-tab-font-size: var(--skeleton-font-size-sm: );
--conduction-tabs-tab-font-size: var(--skeleton-font-size-sm);
--conduction-tabs-tab-font-weight: var(--skeleton-font-weight-normal);
--conduction-tabs-tab-font-family: "Noto Sans", Arial, sans-serif;
--conduction-tabs-tab-max-width: unset;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
display: block;
overflow: hidden;
max-width: 100%;
white-space: wrap;
white-space: nowrap;
}

.primary .link:not(.currentLink) {
Expand Down

0 comments on commit fba3daf

Please sign in to comment.