Skip to content

Commit

Permalink
Merge branch 'next'
Browse files Browse the repository at this point in the history
  • Loading branch information
kellyjosephprice committed Oct 3, 2024
2 parents 77be1a3 + 0db3627 commit 086c406
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 3 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions __tests__/browser/markdown.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ describe('visual regression tests', () => {
//'features',
'headings',
'images',
'imageTests',
'lists',
'mdxComponents',
'tables',
Expand Down
2 changes: 1 addition & 1 deletion components/Accordion/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const Accordion = ({ children, icon, iconColor, title }) => {
return (
<details className="Accordion" onToggle={() => setIsOpen(!isOpen)}>
<summary className="Accordion-title">
<i className={`Accordion-toggleIcon${isOpen ? '_opened' : ''} <i class="fa fa-regular fa-chevron-right"></i>`}></i>
<i className={`Accordion-toggleIcon${isOpen ? '_opened' : ''} fa fa-regular fa-chevron-right`}></i>
{icon && <i className={`Accordion-icon fa-duotone fa-solid ${icon}`} style={{ color: `${iconColor}` }}></i>}
{title}
</summary>
Expand Down
2 changes: 1 addition & 1 deletion components/Accordion/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

&-toggleIcon,
&-toggleIcon_opened {
color: var(--color-text-default, #384248);
color: var(--color-text-minimum, #637288);
font-size: 14px;
margin-left: 5px;
margin-right: 10px;
Expand Down
2 changes: 1 addition & 1 deletion components/Image/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const Image = (Props: ImageProps) => {
setLightbox(!lightbox);
};

if (caption) {
if (children || caption) {
return (
<figure>
<span
Expand Down
35 changes: 35 additions & 0 deletions docs/image-tests.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
We're excited you're here! :blue_heart:

<Image src="https://owlbertsio-resized.s3.amazonaws.com/Blocks.psd.full.png">
Owlbert!
</Image>

<Table align={["left","left","left"]}>
<thead>
<tr>
<th style={{ textAlign: "left" }} />

<th style={{ textAlign: "left" }} />

<th style={{ textAlign: "left" }} />
</tr>
</thead>

<tbody>
<tr>
<td style={{ textAlign: "left" }} />

<td style={{ textAlign: "left" }} />

<td style={{ textAlign: "left" }} />
</tr>

<tr>
<td style={{ textAlign: "left" }} />

<td style={{ textAlign: "left" }} />

<td style={{ textAlign: "left" }} />
</tr>
</tbody>
</Table>
3 changes: 3 additions & 0 deletions example/docs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ import headings from '../docs/headings.md';
// @ts-ignore
import images from '../docs/images.md';
// @ts-ignore
import imageTests from '../docs/image-tests.mdx';
// @ts-ignore
import lists from '../docs/lists.md';
// @ts-ignore
import mdxComponents from '../docs/mdx-components.mdx';
Expand All @@ -42,6 +44,7 @@ const fixtures = Object.entries({
gettingStarted,
headings,
images,
imageTests,
lists,
mdxComponents,
sanitizingTests,
Expand Down

0 comments on commit 086c406

Please sign in to comment.