Skip to content
This repository has been archived by the owner on Apr 28, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into redesign-event-cards
Browse files Browse the repository at this point in the history
  • Loading branch information
JosephCurley committed Dec 29, 2021
2 parents b53eba4 + 407e523 commit 98f0709
Show file tree
Hide file tree
Showing 35 changed files with 1,327 additions and 4,767 deletions.
2 changes: 1 addition & 1 deletion .storybook/helpers/backgroundOverride.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import scssExports from "../../src/global/exports.scss";

// This is only needed because Chromatic does not (yet) support snapshot tests that respect the backgrounds add-on

const backgroundOverride = (color = scssExports.colorGrey500) => html`<style>
const backgroundOverride = (color = scssExports.colorGrey900) => html`<style>
.sb-show-main {
background: ${color};
}
Expand Down
3 changes: 2 additions & 1 deletion .storybook/helpers/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import html from "./html";
import repeat from "./repeat";
import backgroundOverride from "./backgroundOverride";

export { html, repeat };
export { html, repeat, backgroundOverride };
2 changes: 1 addition & 1 deletion .storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
// https://storybook.js.org/docs/html/essentials/introduction
actions: false,
backgrounds: true,
controls: false,
controls: true,
docs: false,
toolbars: false,
},
Expand Down
12 changes: 10 additions & 2 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { addDecorator, addParameters } from "@storybook/html";
import { useEffect } from "@storybook/client-api";
import { withA11y } from "@storybook/addon-a11y";
import global from "../src/global/global";
import colorVariables from "../src/base/_colors.scss";
import "./storybook.css";
Expand All @@ -11,9 +10,18 @@ const marbleGlobalJSDecorator = (storyFn) => {
};

addDecorator(marbleGlobalJSDecorator);
addDecorator(withA11y);

export const parameters = {
a11y: {
config: {
rules: [
{
id: 'frame-tested',
selector: 'iframe:not(.a11y-ignore)', // ignore iframes with a11y-ignore class
},
],
},
},
backgrounds: {
values: [
{ name: "white", value: colorVariables.colorWhite },
Expand Down
2 changes: 1 addition & 1 deletion dist/marble.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/marble.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions dist/marble.js.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

/*!
* Flickity v2.2.2
* Flickity v2.3.0
* Touch, responsive, flickable carousels
*
* Licensed GPLv3 for open source use
Expand All @@ -15,13 +15,13 @@
*/

/*!
* Unidragger v2.3.1
* Unidragger v2.4.0
* Draggable base class
* MIT license
*/

/*!
* Unipointer v2.3.0
* Unipointer v2.4.0
* base class for doing one thing with pointer event
* MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/marble.js.map

Large diffs are not rendered by default.

Loading

0 comments on commit 98f0709

Please sign in to comment.