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

Resolve conflicts between develop and v3.0.0/develop #1245

Closed
wants to merge 7 commits into from
Closed

Resolve conflicts between develop and v3.0.0/develop #1245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ce13302
fix(root): removed attribute sections if they aren't included
GCHQ-Developer-741 Dec 4, 2024
fee1de5
fix(root): add options array to code example
otutukingsley Nov 24, 2024
7e19b41
fix(root): added aria-role to wrapper element in ic-footer
GCHQ-Developer-741 Dec 4, 2024
327fb20
Merge pull request #1237 from mi6/remove-missing-attributes
GCHQ-Developer-741 Dec 4, 2024
907aa90
Merge pull request #1219 from otutukingsley/ic-select-with-multi-code…
GCHQ-Developer-847 Dec 4, 2024
d85f25b
fix(root): display correct styling on nav item
gd2910 Dec 5, 2024
f240c61
Merge pull request #1244 from mi6/1236-top-nav-on-website-doesnt-disp…
GCHQ-Developer-847 Dec 5, 2024
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
17 changes: 11 additions & 6 deletions src/components/ComponentDetails/AttributeName/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ const AttributeName: React.FC<{
value: (string | undefined)[];
}> = ({ name, value }) => (
<div className="attribute-name">
{name.map((attributeName, i) => (
<div key={`attribute-${attributeName.toLowerCase().split(" ")[0]}`}>
<ic-typography variant="subtitle-small">{attributeName}</ic-typography>
<ic-typography variant="subtitle-large">{value[i]}</ic-typography>
</div>
))}
{name.map(
(attributeName, i) =>
value[i] && (
<div key={`attribute-${attributeName.toLowerCase().split(" ")[0]}`}>
<ic-typography variant="subtitle-small">
{attributeName}
</ic-typography>
<ic-typography variant="subtitle-large">{value[i]}</ic-typography>
</div>
)
)}
</div>
);

Expand Down
2 changes: 1 addition & 1 deletion src/components/Layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ const Layout: React.FC<LayoutProps> = ({
{footerLink.text}
</ic-footer-link>
))}
<div slot="logo" className="logo-wrapper">
<div slot="logo" className="logo-wrapper" role="list">
<ic-footer-link href="https://sis.gov.uk">
<SISLogo aria-hidden="true" />
<span className="link-text">Go to S.I.S. website</span>
Expand Down
4 changes: 2 additions & 2 deletions src/components/TopNavWrapper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ const TopNavWrapper: React.FC<TopNavWrapperProps> = ({
<a slot="app-icon" href={withPrefix("/")}>
<ICDSLogo role="img" aria-labelledby="icds-link" className="icds-logo" />
</a>
{textLinks.map(({ key, text, ...rest }) => (
{textLinks.map(({ key, text, props }) => (
<ic-navigation-item slot="navigation" key={key}>
<GatsbyLink slot="navigation-item" {...rest}>
<GatsbyLink slot="navigation-item" {...props}>
{text}
</GatsbyLink>
</ic-navigation-item>
Expand Down
5 changes: 3 additions & 2 deletions src/content/structured/components/footer/code.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export const snippetsLogoLinks = [
<ic-footer-link slot="link" href="#">Styles</ic-footer-link>
<ic-footer-link slot="link" href="#">Components</ic-footer-link>
<ic-footer-link slot="link" href="#">Patterns</ic-footer-link>
<div slot="logo">
<div slot="logo" role="list">
<ic-footer-link href="#">
<svg xmlns="http://www.w3.org/2000/svg"
height="48"
Expand Down Expand Up @@ -267,7 +267,7 @@ export const snippetsLogoLinks = [
<IcFooterLink slot="link" href="#">Styles</IcFooterLink>
<IcFooterLink slot="link" href="#">Components</IcFooterLink>
<IcFooterLink slot="link" href="#">Patterns</IcFooterLink>
<div slot="logo">
<div slot="logo" role="list">
<IcFooterLink href="#">
<SlottedSVG
xmlns="http://www.w3.org/2000/svg"
Expand Down Expand Up @@ -332,6 +332,7 @@ export const snippetsLogoLinks = [
display: "flex",
gap: "var(--ic-space-lg)",
}}
role="list"
>
<IcFooterLink href="#">
<svg
Expand Down
9 changes: 9 additions & 0 deletions src/content/structured/components/multi-select/code.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,15 @@ return (
},
});
const classes = useStyles();
const options = [
{ label: "Cappuccino", value: "Cap" },
{ label: "Latte", value: "Lat" },
{ label: "Americano", value: "Ame" },
{ label: "Filter", value: "Fil" },
{ label: "Flat white", value: "Fla" },
{ label: "Mocha", value: "Moc" },
{ label: "Macchiato", value: "Mac" },
];
return (
<div className={classes.parentContainer}>
{shortCode}
Expand Down
7 changes: 6 additions & 1 deletion src/content/structured/components/popover-menu/guidance.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,12 @@ export const IntroPopover = () => {
<path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z" />
</svg>
</IcButton>
<IcPopoverMenu anchor="button-1" aria-label="popover" open={popoverOpen} onIcPopoverClosed={handlePopoverClosed}>
<IcPopoverMenu
anchor="button-1"
aria-label="popover"
open={popoverOpen}
onIcPopoverClosed={handlePopoverClosed}
>
<IcMenuItem label="Copy code" />
<IcMenuItem label="Paste code" />
<IcMenuItem label="Actions" submenuTriggerFor="actions" />
Expand Down
Loading
Loading