Skip to content

Commit 9e6bc5c

Browse files
pfultonaramos-adobe
authored andcommitted
chore: remove darkest as SB option (#2679)
1 parent 63047f6 commit 9e6bc5c

File tree

1 file changed

+0
-28
lines changed

1 file changed

+0
-28
lines changed

.storybook/preview.js

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
<<<<<<< HEAD
21
import {
32
withActions,
43
withArgEvents,
@@ -13,19 +12,6 @@ import { FontLoader, IconLoader } from "./loaders";
1312
import modes from "./modes";
1413
import DocumentationTemplate from "./templates/DocumentationTemplate.mdx";
1514
import { argTypes, globalTypes } from "./types";
16-
=======
17-
18-
import DocumentationTemplate from "./DocumentationTemplate.mdx";
19-
20-
import { withActions } from "@storybook/addon-actions/decorator";
21-
import {
22-
withContextWrapper,
23-
withLanguageWrapper,
24-
withReducedMotionWrapper,
25-
withTestingPreviewWrapper,
26-
withTextDirectionWrapper,
27-
} from "./decorators/index.js";
28-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
2915

3016
import "./assets/base.css";
3117

@@ -43,7 +29,6 @@ export const parameters = {
4329
actions: { argTypesRegex: "^on.*" },
4430
options: {
4531
storySort: {
46-
<<<<<<< HEAD
4732
method: "alphabetical-by-kind",
4833
order: [
4934
"Guides",
@@ -56,10 +41,6 @@ export const parameters = {
5641
["*", ["Docs", "Default", "*"]],
5742
"*",
5843
],
59-
=======
60-
method: "alphabetical",
61-
order: ["Guides", ["Contributing", "*", "Adobe Code of Conduct", "Changelog"], "Foundations", "Components", ["Docs", "Default", "*"], "*"],
62-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
6344
includeNames: true,
6445
},
6546
},
@@ -88,17 +69,8 @@ export const parameters = {
8869
},
8970
},
9071
docs: {
91-
<<<<<<< HEAD
9272
page: DocumentationTemplate,
9373
story: { inline: true },
94-
=======
95-
autodocs: true,
96-
page: DocumentationTemplate,
97-
story: {
98-
inline: true,
99-
iframeHeight: "200px",
100-
},
101-
>>>>>>> 8e9945253 (feat(downstate): docs + implementation for example components (#2520))
10274
source: {
10375
dark: false,
10476
excludeDecorators: true,

0 commit comments

Comments
 (0)