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

Jump to bottom

fix: update dependencies, first fixes #30

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: update dependencies, first fixes #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f75879e
fix: update dependencies, first fixes
julrich Nov 20, 2022
ecc0f68
fix: add latest fixes
julrich Nov 20, 2022
877cdba
feat: add Style Dictionary setup / integration
julrich Nov 20, 2022
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
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,5 @@
node_modules/

# generated kickstartDS token files
token/src/tokens.css
token/src/icons/IconSprite.js
42 changes: 21 additions & 21 deletions button/doc/button.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import { Button } from '@backlight-dev/selection-inventory-n5vl9.blank-kzk2liwl"
scope={{ Button }}
code={`
<Button label="Solid" variant="solid" />
<Button label="Solid (inverted)" variant="solid-inverted" />
<Button label="Solid (inverted)" variant="solid" inverted={true} />
<Button label="Outline" variant="outline" />
<Button label="Clear" variant="clear" />
`}
Expand All @@ -45,17 +45,17 @@ import { Button } from '@backlight-dev/selection-inventory-n5vl9.blank-kzk2liwl"
<Playground
scope={{ Button }}
code={`
<Button iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button iconBefore={true} icon={{icon: 'chevron-left'}} label="Icon left" variant="solid" />
<Button iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button iconBefore={{icon: 'chevron-left'}} label="Icon left" variant="solid" />
<hr/>
<Button iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid-inverted" />
<Button iconBefore={true} icon={{icon: 'chevron-left'}} label="Icon left" variant="solid-inverted" />
<Button iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" inverted={true} />
<Button iconBefore={{icon: 'chevron-left'}} label="Icon left" variant="solid" inverted={true} />
<hr/>
<Button iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button iconBefore={true} icon={{icon: 'chevron-left'}} label="Icon left" variant="outline" />
<Button iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button iconBefore={{icon: 'chevron-left'}} label="Icon left" variant="outline" />
<hr/>
<Button iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<Button iconBefore={true} icon={{icon: 'chevron-left'}} label="Icon left" variant="clear" />
<Button iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<Button iconBefore={{icon: 'chevron-left'}} label="Icon left" variant="clear" />
`}
/>

Expand All @@ -64,20 +64,20 @@ import { Button } from '@backlight-dev/selection-inventory-n5vl9.blank-kzk2liwl"
<Playground
scope={{ Button }}
code={`
<Button iconAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button iconAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid-inverted" />
<Button iconAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button iconAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<Button iconAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button iconAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" inverted={true} />
<Button iconAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button iconAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<hr/>
<Button fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid-inverted" />
<Button fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<Button fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" inverted={true} />
<Button fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<hr/>
<Button iconAnimation={true} fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button iconAnimation={true} fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="solid-inverted" />
<Button iconAnimation={true} fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button iconAnimation={true} fillAnimation={true} iconAfter={true} icon={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
<Button iconAnimation={true} fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" />
<Button iconAnimation={true} fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="solid" inverted={true} />
<Button iconAnimation={true} fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="outline" />
<Button iconAnimation={true} fillAnimation={true} iconAfter={{icon: 'chevron-right'}} label="Icon right" variant="clear" />
`}
/>

Expand Down
12 changes: 9 additions & 3 deletions header/src/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
} from '@chakra-ui/react';
import { HamburgerIcon, CloseIcon, AtSignIcon } from '@chakra-ui/icons';

import { LinkButton } from '~/link-button/src/LinkButton';
import { Button as KDSButton } from '~/button/src/Button';

const Links = [
{
Expand All @@ -35,7 +35,13 @@ const Links = [
},
];

const NavLink = ({ children, href }: { children: React.ReactNode; href: string }) => (
const NavLink = ({
children,
href,
}: {
children: React.ReactNode;
href: string;
}) => (
<Link
px={2}
py={1}
Expand Down Expand Up @@ -96,7 +102,7 @@ export const Header = () => {
</HStack>
</HStack>
<Flex alignItems={'center'}>
<LinkButton
<KDSButton
iconBefore={true}
icon={{ icon: 'twitter', role: 'icon' }}
variant="outline"
Expand Down
86 changes: 0 additions & 86 deletions link-button/doc/link-button.mdx
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion link-button/package.json
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions link-button/src/LinkButton.tsx
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions link-button/stories/index.stories.jsx
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions mdx-layout/src/mdx-layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { extendTheme, ChakraProvider } from '@chakra-ui/react';
import { IconSprite } from '~/icon-sprite/src/IconSprite';
import { Header } from '~/header/src/Header';
import { Footer } from '~/footer/src/Footer';
import { Section } from '~/section/src/Section';
import { Section } from '@kickstartds/base/lib/section';

import theme from '../../chakra-theme/src/theme';

Expand All @@ -25,7 +25,7 @@ export const Layout = (props) => (
<MDXProvider>
<IconSprite />
<Header />
<Section>
<Section width="default" background="default">
<main>{props.children}</main>
</Section>
<Footer />
Expand Down
15 changes: 9 additions & 6 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
"type": "module",
"homepage": "{{ homepage }}",
"scripts": {
"serve": "npx backlight@latest serve eqcWzgOoYUerJev6X25c --open"
"serve": "npx backlight@latest serve eqcWzgOoYUerJev6X25c --open",
"build-tokens": "kickstartDS tokens compile --token-dictionary-path token/src/dictionary",
"init-tokens": "kickstartDS tokens init --branding-token-path token/src/branding-token.json --token-dictionary-path token/src/dictionary"
},
"devDependencies": {
"@divriots/dockit-react": "^0.0.84",
Expand All @@ -15,17 +17,18 @@
"dependencies": {
"@chakra-ui/icons": "^1.1.7",
"@chakra-ui/react": "^1.8.6",
"@kickstartds/core": "^1.6.0-next.9",
"@kickstartds/base": "^1.6.0-next.9",
"@kickstartds/blog": "^1.6.0-next.9",
"@kickstartds/content": "^1.6.0-next.9",
"@kickstartds/core": "^2.0.2",
"@kickstartds/base": "^2.0.2",
"@kickstartds/blog": "^2.0.2",
"@kickstartds/content": "2.0.0--canary.5.14.0",
"classnames": "^2.3.1",
"include-media": "^1.4.10",
"kickstartds": "^1.0.0",
"react": "^17.0.2",
"react-card-flip": "^1.1.5",
"react-dom": "^17.0.2",
"react-h5-audio-player": "^3.8.3",
"react-icons": "^4.3.1",
"react-markdown": "^8.0.0"
}
}
}
21 changes: 21 additions & 0 deletions sd.config.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
const path = require('path');
const StyleDictionary = require('style-dictionary');
const { config } = require('@kickstartds/style-dictionary');

module.exports = StyleDictionary.extend(config).extend({
source: [
'token/src/dictionary/**/*.json',
path.join(
path.dirname(require.resolve('@kickstartds/core/package.json')),
'source/design-tokens/icons/*.svg'
),
],
platforms: {
css: {
buildPath: 'token/src/',
},
jsx: {
buildPath: 'token/src/icons/',
},
},
});
12 changes: 5 additions & 7 deletions section/src/Section.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
SectionContextDefault,
SectionProps as KDSSectionProps,
} from '@kickstartds/base/lib/section';
import { Button } from '@kickstartds/base/lib/button';
import { Button } from '~/button/src/Button';
import './SectionSlider.js';

import './_section.scss';
Expand Down Expand Up @@ -62,19 +62,17 @@ export const Section = ({ width, background, ...props }) => {
>
<div className="l-section--slider__arrows">
<Button
iconAfter
className="c-button--slider-arrow"
icon={{
iconAfter={{
icon: 'chevron-left',
}}
className="c-button--slider-arrow"
disabled
/>
<Button
iconAfter
className="c-button--slider-arrow"
icon={{
iconAfter={{
icon: 'chevron-right',
}}
className="c-button--slider-arrow"
/>
</div>
</SectionContextDefault>
Expand Down
Loading